Merge pull request #113393 from KoBeWi/derootizator

akien-mga · akien-mga · commit 725cf51353f3 · 2025-12-01T12:56:34.000+01:00
Unassign scene root before freeing
diff --git a/editor/editor_data.cpp b/editor/editor_data.cpp
@@ -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());
 		}
 
+		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);
 		edited_scene.write[p_idx].root = nullptr;
 	}

Original file line number	Diff line number	Diff line change
`@@ -643,6 +643,9 @@ void EditorData::remove_scene(int p_idx) {`
`643`	`643`	`editor_plugins[i]->notify_scene_closed(edited_scene[p_idx].root->get_scene_file_path());`
`644`	`644`	`}`
`645`	`645`
	`646`	`+ if (edited_scene[p_idx].root == SceneTree::get_singleton()->get_edited_scene_root()) {`
	`647`	`+ SceneTree::get_singleton()->set_edited_scene_root(nullptr);`
	`648`	`+ }`
`646`	`649`	`memdelete(edited_scene[p_idx].root);`
`647`	`650`	`edited_scene.write[p_idx].root = nullptr;`
`648`	`651`	`}`