Skip to content

Commit 7fa4698

Browse files
committed
Merge pull request godotengine#90317 from ajreckof/Fix-strange-visual-bug-with-camera-and-external-change-
Fix strange visual bug with camera and external change.
2 parents 898d8e3 + 609559c commit 7fa4698

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

editor/editor_data.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -722,6 +722,7 @@ bool EditorData::check_and_update_scene(int p_idx) {
722722

723723
new_scene->set_scene_file_path(edited_scene[p_idx].root->get_scene_file_path());
724724
Node *old_root = edited_scene[p_idx].root;
725+
edited_scene.write[p_idx].root = new_scene;
725726
old_root->replace_by(new_scene, false, false);
726727
memdelete(old_root);
727728
edited_scene.write[p_idx].selection = new_selection;

editor/editor_node.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3674,7 +3674,9 @@ void EditorNode::set_edited_scene(Node *p_scene) {
36743674
if (old_edited_scene_root->get_parent() == scene_root) {
36753675
scene_root->remove_child(old_edited_scene_root);
36763676
}
3677-
old_edited_scene_root->disconnect(SNAME("replacing_by"), callable_mp(this, &EditorNode::set_edited_scene));
3677+
if (old_edited_scene_root->is_connected("replacing_by", callable_mp(this, &EditorNode::set_edited_scene))) {
3678+
old_edited_scene_root->disconnect(SNAME("replacing_by"), callable_mp(this, &EditorNode::set_edited_scene));
3679+
}
36783680
}
36793681
get_editor_data().set_edited_scene_root(p_scene);
36803682

0 commit comments

Comments
 (0)