Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-10-30 21:21:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix selecting root when opening scene.

Browse source
This commit is contained in:
ajreckof 2024-05-02 04:15:19 +02:00
parent f91db3dc58
commit 0ab5d37049
2 changed files with 1 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
editor/editor_node.cpp
View file

@ -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(); EditorDebuggerNode::get_singleton()->update_live_edit_root();
// Tell everything to edit this object, unless we're in the process of restoring scenes. if (restoring_scenes) {
// If we are, we'll edit it after the restoration is done.
if (!restoring_scenes) {
push_item(new_scene);
} else {
// Initialize history for restored scenes. // Initialize history for restored scenes.
ObjectID id = new_scene->get_instance_id(); ObjectID id = new_scene->get_instance_id();
if (id != editor_history.get_current()) { if (id != editor_history.get_current()) {

1
editor/scene_tree_dock.cpp
View file

@ -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->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));