Merge pull request #93543 from anniryynanen/scene-tree-reselect

Fix reselecting scene tree node after inspecting a resource
godotengine · Jun 24, 2024 · 882489d · 882489d
2 parents f99c7e9 + eed6f4f
commit 882489d
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/editor/gui/scene_tree_editor.cpp b/editor/gui/scene_tree_editor.cpp
@@ -589,7 +589,6 @@ void SceneTreeEditor::_node_removed(Node *p_node) {
 
 	if (p_node == selected) {
 		selected = nullptr;
-		emit_signal(SNAME("node_selected"));
 	}
 }
 

diff --git a/editor/scene_tree_dock.cpp b/editor/scene_tree_dock.cpp
@@ -4495,6 +4495,7 @@ SceneTreeDock::SceneTreeDock(Node *p_scene_root, EditorSelection *p_editor_selec
 	scene_tree->set_v_size_flags(SIZE_EXPAND | SIZE_FILL);
 	scene_tree->connect("rmb_pressed", callable_mp(this, &SceneTreeDock::_tree_rmb));
 
+	scene_tree->connect("node_selected", callable_mp(this, &SceneTreeDock::_node_selected), CONNECT_DEFERRED);
 	scene_tree->connect("node_renamed", callable_mp(this, &SceneTreeDock::_node_renamed), CONNECT_DEFERRED);
 	scene_tree->connect("node_prerename", callable_mp(this, &SceneTreeDock::_node_prerenamed));
 	scene_tree->connect("open", callable_mp(this, &SceneTreeDock::_load_request));
-Original file line number
+Diff line change
@@ Expand Up / @@ -589,7 +589,6 @@ void SceneTreeEditor::_node_removed(Node *p_node) { @@
     	if (p_node == selected) {
     		selected = nullptr;
-    		emit_signal(SNAME("node_selected"));
     	}
     }
@@ Expand Down @@