ソースを参照

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

Fix reselecting scene tree node after inspecting a resource
Rémi Verschelde 1 年間 前
コミット
882489d15c
2 ファイル変更1 行追加1 行削除
  1. 0 1
      editor/gui/scene_tree_editor.cpp
  2. 1 0
      editor/scene_tree_dock.cpp

+ 0 - 1
editor/gui/scene_tree_editor.cpp

@@ -589,7 +589,6 @@ void SceneTreeEditor::_node_removed(Node *p_node) {
 
 
 	if (p_node == selected) {
 	if (p_node == selected) {
 		selected = nullptr;
 		selected = nullptr;
-		emit_signal(SNAME("node_selected"));
 	}
 	}
 }
 }
 
 

+ 1 - 0
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->set_v_size_flags(SIZE_EXPAND | SIZE_FILL);
 	scene_tree->connect("rmb_pressed", callable_mp(this, &SceneTreeDock::_tree_rmb));
 	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_renamed", callable_mp(this, &SceneTreeDock::_node_renamed), CONNECT_DEFERRED);
 	scene_tree->connect("node_prerename", callable_mp(this, &SceneTreeDock::_node_prerenamed));
 	scene_tree->connect("node_prerename", callable_mp(this, &SceneTreeDock::_node_prerenamed));
 	scene_tree->connect("open", callable_mp(this, &SceneTreeDock::_load_request));
 	scene_tree->connect("open", callable_mp(this, &SceneTreeDock::_load_request));