diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2024-05-13 12:05:39 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2024-05-13 12:05:39 +0200 |
| commit | 0ebba3023e42274a12ebe69840429797c9a2728c (patch) | |
| tree | 3e9885e0a260ed7db24b1e4ddf2d53155aa82e00 | |
| parent | 3bb7fd8ac4d69e170bda9a111ec135907d7873a8 (diff) | |
| parent | 0ab5d37049d63bbdd4451efb413082f7441d005c (diff) | |
| download | redot-engine-0ebba3023e42274a12ebe69840429797c9a2728c.tar.gz | |
Merge pull request #91435 from ajreckof/Fix-selecting-root-when-opening-scene-
Fix selecting root when opening scene.
| -rw-r--r-- | editor/editor_node.cpp | 6 | ||||
| -rw-r--r-- | editor/scene_tree_dock.cpp | 1 |
2 files changed, 1 insertions, 6 deletions
diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index d7f197b569..e8a0b77184 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -4073,11 +4073,7 @@ Error EditorNode::load_scene(const String &p_scene, bool p_ignore_broken_deps, b EditorDebuggerNode::get_singleton()->update_live_edit_root(); - // Tell everything to edit this object, unless we're in the process of restoring scenes. - // If we are, we'll edit it after the restoration is done. - if (!restoring_scenes) { - push_item(new_scene); - } else { + if (restoring_scenes) { // Initialize history for restored scenes. ObjectID id = new_scene->get_instance_id(); if (id != editor_history.get_current()) { diff --git a/editor/scene_tree_dock.cpp b/editor/scene_tree_dock.cpp index 6f0a8bc909..cb379c198f 100644 --- a/editor/scene_tree_dock.cpp +++ b/editor/scene_tree_dock.cpp @@ -4357,7 +4357,6 @@ 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)); |