summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnni Ryynänen <anni@anniryynanen.com>2024-06-24 13:17:45 +0300
committerAnni Ryynänen <anni@anniryynanen.com>2024-06-24 13:17:45 +0300
commiteed6f4fef4645bc0791ab58c8915b78b55f12f38 (patch)
tree0b84d764a00c9572225f3e4a0c1e854e1f288f56
parent04bf7d4cade645a5923cc80d87ac1c6109e2cdfe (diff)
downloadredot-engine-eed6f4fef4645bc0791ab58c8915b78b55f12f38.tar.gz
Fix reselecting scene tree node after inspecting a resource
This broke when the `node_selected` connection was removed in #91435. Here it's returned, but the emit is removed from `_node_removed`. That preserves the earlier fix while allowing nodes to be reselected.
-rw-r--r--editor/gui/scene_tree_editor.cpp1
-rw-r--r--editor/scene_tree_dock.cpp1
2 files changed, 1 insertions, 1 deletions
diff --git a/editor/gui/scene_tree_editor.cpp b/editor/gui/scene_tree_editor.cpp
index eea2511cc5..a3e62c298f 100644
--- 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
index 566b460bca..7f60fbbdb9 100644
--- 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));