sascha
/
godot
mirror of https://github.com/godotengine/godot.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #113393 from KoBeWi/derootizator 

Unassign scene root before freeing
pull/112224/merge
Rémi Verschelde 2025-12-01 12:56:34 +07:00
parent 7a207b3eaa 7573388c82
commit 725cf51353
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
editor/editor_data.cpp
Unescape Escape View File

@ -643,6 +643,9 @@ void EditorData::remove_scene(int p_idx) {
editor_plugins[i]->notify_scene_closed(edited_scene[p_idx].root->get_scene_file_path()); editor_plugins[i]->notify_scene_closed(edited_scene[p_idx].root->get_scene_file_path());
} }
if (edited_scene[p_idx].root == SceneTree::get_singleton()->get_edited_scene_root()) {
SceneTree::get_singleton()->set_edited_scene_root(nullptr);
}
memdelete(edited_scene[p_idx].root); memdelete(edited_scene[p_idx].root);
edited_scene.write[p_idx].root = nullptr; edited_scene.write[p_idx].root = nullptr;
} }