gaming/godot
gaming/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot synced 2024-09-16 03:56:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #32672 from codecustard/fix_merge_scene_not_deselecting

Browse source 
Fixes deselection not working when merging scene
This commit is contained in:
Rémi Verschelde 2019-10-09 08:42:16 +02:00 committed by GitHub
parent 55ef6a0f25 b5ff31a433
commit 564a258831
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
editor/editor_sub_scene.cpp
View file

@ -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<Node *>::Element *E = selection.find(n);
if (E)
selection.erase(E);
}
}
}