From b5ff31a4336db5eaa482dc1771ba1c7372491ee5 Mon Sep 17 00:00:00 2001 From: Emmanuel Barroga Date: Tue, 8 Oct 2019 19:21:11 -0700 Subject: [PATCH] Fixes deselection not working when merging scene Fixes the issue of multiselection retaining its selection when deselecting in the merge scene dialog --- editor/editor_sub_scene.cpp | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/editor/editor_sub_scene.cpp b/editor/editor_sub_scene.cpp index 987033b1233..a77051c80ba 100644 --- a/editor/editor_sub_scene.cpp +++ b/editor/editor_sub_scene.cpp @@ -97,8 +97,14 @@ void EditorSubScene::_fill_tree(Node *p_node, TreeItem *p_parent) { } void EditorSubScene::_selected_changed() { - selection.clear(); - is_root = false; + TreeItem *item = tree->get_selected(); + ERR_FAIL_COND(!item); + Node *n = item->get_metadata(0); + + if (!n || !selection.find(n)) { + selection.clear(); + is_root = false; + } } void EditorSubScene::_item_multi_selected(Object *p_object, int p_cell, bool p_selected) { @@ -116,6 +122,11 @@ void EditorSubScene::_item_multi_selected(Object *p_object, int p_cell, bool p_s selection.clear(); } selection.push_back(n); + } else { + List::Element *E = selection.find(n); + + if (E) + selection.erase(E); } } }