File tree Expand file tree Collapse file tree 2 files changed +4
-1
lines changed
Expand file tree Collapse file tree 2 files changed +4
-1
lines changed Original file line number Diff line number Diff 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;
Original file line number Diff line number Diff 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
You can’t perform that action at this time.
0 commit comments