Merge pull request #90432 from Rindbee/correctly-replace-scene-root-when-must_reload

Correctly replace scene root when `must_reload` in `EditorData::check_and_update_scene()`
This commit is contained in:
Rémi Verschelde 2024-04-10 14:22:29 +02:00
commit 9c5e968bbc
No known key found for this signature in database
GPG key ID: C3336907360768E1
7 changed files with 31 additions and 91 deletions

View file

@ -3670,9 +3670,7 @@ void EditorNode::set_edited_scene(Node *p_scene) {
if (old_edited_scene_root->get_parent() == scene_root) {
scene_root->remove_child(old_edited_scene_root);
}
if (old_edited_scene_root->is_connected("replacing_by", callable_mp(this, &EditorNode::set_edited_scene))) {
old_edited_scene_root->disconnect(SNAME("replacing_by"), callable_mp(this, &EditorNode::set_edited_scene));
}
old_edited_scene_root->disconnect(SNAME("replacing_by"), callable_mp(this, &EditorNode::set_edited_scene));
}
get_editor_data().set_edited_scene_root(p_scene);