diff options
| author | ajreckof <tbonhoure@ymail.com> | 2024-05-02 04:15:19 +0200 |
|---|---|---|
| committer | ajreckof <tbonhoure@ymail.com> | 2024-05-12 21:46:21 +0200 |
| commit | 0ab5d37049d63bbdd4451efb413082f7441d005c (patch) | |
| tree | 1587228649e2480598c5a30a0a9129a5febaa6fd | |
| parent | f91db3dc58f1d6a0cb63d591515183b5a45cd3ba (diff) | |
| download | redot-engine-0ab5d37049d63bbdd4451efb413082f7441d005c.tar.gz | |
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 7ae566dd2c..a3e95d33fe 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -4055,11 +4055,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 67c269aa80..8cf407e53e 100644 --- a/editor/scene_tree_dock.cpp +++ b/editor/scene_tree_dock.cpp @@ -4354,7 +4354,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)); |