godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-26 15:46:23 +00:00
Code Releases Wiki Activity

Call EditorNode::set_edited_scene() manually instead of via the replacing_by signal

Browse Source 
Cannot change `scene_root`'s child node in `EditorNode::set_edited_scene()`
if replaced later using `replace_by`.
This commit is contained in:
风青山
2024-06-04 22:03:11 +08:00
parent 7b63ac488e
commit 85a1662e3b
3 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
editor/editor_node.cpp
View File

@@ -3706,13 +3706,16 @@ void EditorNode::_remove_scene(int index, bool p_change_tab) {
} }
void EditorNode::set_edited_scene(Node *p_scene) { void EditorNode::set_edited_scene(Node *p_scene) {
set_edited_scene_root(p_scene, true);
}
void EditorNode::set_edited_scene_root(Node *p_scene, bool p_auto_add) {
Node *old_edited_scene_root = get_editor_data().get_edited_scene_root(); Node *old_edited_scene_root = get_editor_data().get_edited_scene_root();
if (old_edited_scene_root) { ERR_FAIL_COND_MSG(p_scene && p_scene != old_edited_scene_root && p_scene->get_parent(), "Non-null nodes that are set as edited scene should not have a parent node.");
if (old_edited_scene_root->get_parent() == scene_root) {
if (p_auto_add && old_edited_scene_root && old_edited_scene_root->get_parent() == scene_root) {
scene_root->remove_child(old_edited_scene_root); scene_root->remove_child(old_edited_scene_root);
} }
old_edited_scene_root->disconnect(SNAME("replacing_by"), callable_mp(this, &EditorNode::set_edited_scene));
}
get_editor_data().set_edited_scene_root(p_scene); get_editor_data().set_edited_scene_root(p_scene);
if (Object::cast_to<Popup>(p_scene)) { if (Object::cast_to<Popup>(p_scene)) {
@@ -3723,12 +3726,9 @@ void EditorNode::set_edited_scene(Node *p_scene) {
get_tree()->set_edited_scene_root(p_scene); get_tree()->set_edited_scene_root(p_scene);
} }
if (p_scene) { if (p_auto_add && p_scene) {
if (p_scene->get_parent() != scene_root) {
scene_root->add_child(p_scene, true); scene_root->add_child(p_scene, true);
} }
p_scene->connect(SNAME("replacing_by"), callable_mp(this, &EditorNode::set_edited_scene));
}
} }
int EditorNode::_get_current_main_editor() { int EditorNode::_get_current_main_editor() {
@@ -5967,6 +5967,8 @@ void EditorNode::reload_instances_with_path_in_edited_scenes(const String &p_ins
instantiated_node->set_scene_file_path(String()); instantiated_node->set_scene_file_path(String());
} }
current_edited_scene = instantiated_node; current_edited_scene = instantiated_node;
editor_data.set_edited_scene_root(current_edited_scene);
} }
// Replace the original node with the instantiated version. // Replace the original node with the instantiated version.

1
editor/editor_node.h
View File

@@ -783,6 +783,7 @@ public:
SubViewport *get_scene_root() { return scene_root; } // Root of the scene being edited. SubViewport *get_scene_root() { return scene_root; } // Root of the scene being edited.
void set_edited_scene(Node *p_scene); void set_edited_scene(Node *p_scene);
void set_edited_scene_root(Node *p_scene, bool p_auto_add);
Node *get_edited_scene() { return editor_data.get_edited_scene_root(); } Node *get_edited_scene() { return editor_data.get_edited_scene_root(); }
void fix_dependencies(const String &p_for_file); void fix_dependencies(const String &p_for_file);

4
editor/scene_tree_dock.cpp
View File

@@ -2992,6 +2992,10 @@ void SceneTreeDock::_replace_node(Node *p_node, Node *p_by_node, bool p_keep_pro
to_erase.push_back(oldnode->get_child(i)); to_erase.push_back(oldnode->get_child(i));
} }
} }
if (oldnode == edited_scene) {
EditorNode::get_singleton()->set_edited_scene_root(newnode, false);
}
oldnode->replace_by(newnode, true); oldnode->replace_by(newnode, true);
// Re-apply size of anchored control. // Re-apply size of anchored control.