summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2020-07-21 21:09:47 +0200
committerGitHub <noreply@github.com>2020-07-21 21:09:47 +0200
commit60fab23262500789145b83738745fee9de58b7f0 (patch)
tree8a7bb227444d2a8eb05d177f382af434dcf8a512
parent22ed721d15f740d0de3960d21fe58c3e9199f520 (diff)
parentc85d04a77117f6fe5ff5c9b596f46e6f927ed14f (diff)
Merge pull request #32908 from Nehluxhes/node_update_twice
Remove duplicate displayed node update call
-rw-r--r--editor/scene_tree_dock.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/editor/scene_tree_dock.cpp b/editor/scene_tree_dock.cpp
index 90747e45e4..13fb74987c 100644
--- a/editor/scene_tree_dock.cpp
+++ b/editor/scene_tree_dock.cpp
@@ -1217,7 +1217,6 @@ void SceneTreeDock::_node_selected() {
Node *node = scene_tree->get_selected();
if (!node) {
- editor->push_item(nullptr);
return;
}
@@ -1902,11 +1901,10 @@ void SceneTreeDock::_selection_changed() {
if (selection_size > 1) {
//automatically turn on multi-edit
_tool_selected(TOOL_MULTI_EDIT);
- } else if (selection_size == 1) {
- editor->push_item(EditorNode::get_singleton()->get_editor_selection()->get_selected_node_list()[0]);
- } else {
+ } else if (selection_size == 0) {
editor->push_item(nullptr);
}
+
_update_script_button();
}