Merge pull request #108992 from WhalesState/headless-import

Repiteo · Repiteo · commit 1a6da7b40aaa · 2025-07-27T10:28:28.000-05:00
Fix Editor crash during first scan in headless import mode.
diff --git a/editor/editor_data.cpp b/editor/editor_data.cpp
@@ -950,6 +950,7 @@ void EditorData::clear_edited_scenes() {
 		}
 	}
 	edited_scene.clear();
+	SceneTree::get_singleton()->set_edited_scene_root(nullptr);
 }
 
 void EditorData::set_plugin_window_layout(Ref<ConfigFile> p_layout) {
diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp
@@ -5616,14 +5616,6 @@ void EditorNode::_editor_file_dialog_unregister(EditorFileDialog *p_dialog) {
 Vector<EditorNodeInitCallback> EditorNode::_init_callbacks;
 
 void EditorNode::_begin_first_scan() {
-	// In headless mode, scan right away.
-	// This allows users to continue using `godot --headless --editor --quit` to prepare a project.
-	if (!DisplayServer::get_singleton()->window_can_draw()) {
-		OS::get_singleton()->benchmark_begin_measure("Editor", "First Scan");
-		EditorFileSystem::get_singleton()->scan();
-		return;
-	}
-
 	if (!waiting_for_first_scan) {
 		return;
 	}
diff --git a/main/main.cpp b/main/main.cpp
@@ -1653,6 +1653,9 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
 			upwards = true;
 		} else if (arg == "--quit") { // Auto quit at the end of the first main loop iteration
 			quit_after = 1;
+#ifdef TOOLS_ENABLED
+			wait_for_import = true;
+#endif
 		} else if (arg == "--quit-after") { // Quit after the given number of iterations
 			if (N) {
 				quit_after = N->get().to_int();

Original file line number	Diff line number	Diff line change
`@@ -950,6 +950,7 @@ void EditorData::clear_edited_scenes() {`
`950`	`950`	`}`
`951`	`951`	`}`
`952`	`952`	`edited_scene.clear();`
	`953`	`+ SceneTree::get_singleton()->set_edited_scene_root(nullptr);`
`953`	`954`	`}`
`954`	`955`
`955`	`956`	`void EditorData::set_plugin_window_layout(Ref<ConfigFile> p_layout) {`