From c75a33aa5d4124f3de397f4a26b459b72f80dde7 Mon Sep 17 00:00:00 2001 From: Daniel Kinsman Date: Mon, 25 Aug 2025 11:30:56 +1000 Subject: [PATCH 1/3] Fix hang when importing blender files in headless mode --- modules/gltf/editor/editor_scene_importer_blend.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/gltf/editor/editor_scene_importer_blend.cpp b/modules/gltf/editor/editor_scene_importer_blend.cpp index a51b8dbec6d..7a3ef7f7923 100644 --- a/modules/gltf/editor/editor_scene_importer_blend.cpp +++ b/modules/gltf/editor/editor_scene_importer_blend.cpp @@ -516,6 +516,8 @@ void EditorFileSystemImportFormatSupportQueryBlend::_update_icons() { } bool EditorFileSystemImportFormatSupportQueryBlend::query() { + ERR_FAIL_COND_V_MSG(DisplayServer::get_singleton()->get_name() == "headless", true, "Blender path is invalid or not set, check your Editor Settings."); + if (!configure_blender_dialog) { configure_blender_dialog = memnew(ConfirmationDialog); configure_blender_dialog->set_title(TTR("Configure Blender Importer")); From 0cace15d72c02340f13555ae12d6d9339bcaeee7 Mon Sep 17 00:00:00 2001 From: Daniel Kinsman Date: Mon, 25 Aug 2025 21:23:44 +1000 Subject: [PATCH 2/3] better error message --- modules/gltf/editor/editor_scene_importer_blend.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/gltf/editor/editor_scene_importer_blend.cpp b/modules/gltf/editor/editor_scene_importer_blend.cpp index 7a3ef7f7923..8b910b261b3 100644 --- a/modules/gltf/editor/editor_scene_importer_blend.cpp +++ b/modules/gltf/editor/editor_scene_importer_blend.cpp @@ -516,7 +516,7 @@ void EditorFileSystemImportFormatSupportQueryBlend::_update_icons() { } bool EditorFileSystemImportFormatSupportQueryBlend::query() { - ERR_FAIL_COND_V_MSG(DisplayServer::get_singleton()->get_name() == "headless", true, "Blender path is invalid or not set, check your Editor Settings."); + ERR_FAIL_COND_V_MSG(DisplayServer::get_singleton()->get_name() == "headless", true, "Blender is required to import .blend files but it could not be found."); if (!configure_blender_dialog) { configure_blender_dialog = memnew(ConfirmationDialog); From a001026dbbe35f89c57533d8e6f2c712020df823 Mon Sep 17 00:00:00 2001 From: Daniel Kinsman Date: Mon, 25 Aug 2025 22:00:13 +1000 Subject: [PATCH 3/3] Update modules/gltf/editor/editor_scene_importer_blend.cpp Co-authored-by: A Thousand Ships <96648715+AThousandShips@users.noreply.github.com> --- modules/gltf/editor/editor_scene_importer_blend.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/gltf/editor/editor_scene_importer_blend.cpp b/modules/gltf/editor/editor_scene_importer_blend.cpp index 8b910b261b3..80dc089bee0 100644 --- a/modules/gltf/editor/editor_scene_importer_blend.cpp +++ b/modules/gltf/editor/editor_scene_importer_blend.cpp @@ -516,7 +516,7 @@ void EditorFileSystemImportFormatSupportQueryBlend::_update_icons() { } bool EditorFileSystemImportFormatSupportQueryBlend::query() { - ERR_FAIL_COND_V_MSG(DisplayServer::get_singleton()->get_name() == "headless", true, "Blender is required to import .blend files but it could not be found."); + ERR_FAIL_COND_V_MSG(DisplayServer::get_singleton()->get_name() == "headless", true, "Blender path is invalid or not set, check your Editor Settings. Cannot configure blender path in headless mode."); if (!configure_blender_dialog) { configure_blender_dialog = memnew(ConfirmationDialog);