3 files changed, 45 insertions, 10 deletions
diff --git a/modules/gltf/editor/editor_scene_importer_fbx.cpp b/modules/gltf/editor/editor_scene_importer_fbx.cpp
index fb5fb455b8..27e0052c1a 100644
--- a/modules/gltf/editor/editor_scene_importer_fbx.cpp
+++ b/modules/gltf/editor/editor_scene_importer_fbx.cpp
@@ -36,6 +36,7 @@
 
 #include "core/config/project_settings.h"
 #include "editor/editor_settings.h"
+#include "main/main.h"
 
 uint32_t EditorSceneFormatImporterFBX::get_import_flags() const {
 	return ImportFlags::IMPORT_SCENE | ImportFlags::IMPORT_ANIMATION;
@@ -111,4 +112,30 @@ void EditorSceneFormatImporterFBX::get_import_options(const String &p_path,
 		List<ResourceImporter::ImportOption> *r_options) {
 }
 
+bool EditorFileSystemImportFormatSupportQueryFBX::is_active() const {
+	String fbx2gltf_path = EDITOR_GET("filesystem/import/fbx/fbx2gltf_path");
+	return !FileAccess::exists(fbx2gltf_path);
+}
+
+Vector<String> EditorFileSystemImportFormatSupportQueryFBX::get_file_extensions() const {
+	Vector<String> ret;
+	ret.push_back("fbx");
+	return ret;
+}
+
+bool EditorFileSystemImportFormatSupportQueryFBX::query() {
+	FBXImporterManager::get_singleton()->show_dialog(true);
+
+	while (true) {
+		OS::get_singleton()->delay_usec(1);
+		DisplayServer::get_singleton()->process_events();
+		Main::iteration();
+		if (!FBXImporterManager::get_singleton()->is_visible()) {
+			break;
+		}
+	}
+
+	return false;
+}
+
 #endif // TOOLS_ENABLED
diff --git a/modules/gltf/editor/editor_scene_importer_fbx.h b/modules/gltf/editor/editor_scene_importer_fbx.h
index 6bf9f3e033..82179cc460 100644
--- a/modules/gltf/editor/editor_scene_importer_fbx.h
+++ b/modules/gltf/editor/editor_scene_importer_fbx.h
@@ -33,6 +33,8 @@
 
 #ifdef TOOLS_ENABLED
 
+#include "editor/editor_file_system.h"
+#include "editor/fbx_importer_manager.h"
 #include "editor/import/resource_importer_scene.h"
 
 class Animation;
@@ -53,6 +55,15 @@ public:
 			const HashMap<StringName, Variant> &p_options) override;
 };
 
+class EditorFileSystemImportFormatSupportQueryFBX : public EditorFileSystemImportFormatSupportQuery {
+	GDCLASS(EditorFileSystemImportFormatSupportQueryFBX, EditorFileSystemImportFormatSupportQuery);
+
+public:
+	virtual bool is_active() const override;
+	virtual Vector<String> get_file_extensions() const override;
+	virtual bool query() override;
+};
+
 #endif // TOOLS_ENABLED
 
 #endif // EDITOR_SCENE_IMPORTER_FBX_H
diff --git a/modules/gltf/register_types.cpp b/modules/gltf/register_types.cpp
index cd7a23fbb2..2322e13ae2 100644
--- a/modules/gltf/register_types.cpp
+++ b/modules/gltf/register_types.cpp
@@ -80,16 +80,13 @@ static void _editor_init() {
 	EditorSettings::get_singleton()->add_property_hint(PropertyInfo(Variant::STRING,
 			"filesystem/import/fbx/fbx2gltf_path", PROPERTY_HINT_GLOBAL_FILE));
 	if (fbx_enabled) {
-		Ref<DirAccess> da = DirAccess::create(DirAccess::ACCESS_FILESYSTEM);
-		if (fbx2gltf_path.is_empty()) {
-			WARN_PRINT("FBX file import is enabled in the project settings, but no FBX2glTF path is configured in the editor settings. FBX files will not be imported.");
-		} else if (!da->file_exists(fbx2gltf_path)) {
-			WARN_PRINT("FBX file import is enabled, but the FBX2glTF path doesn't point to an accessible file. FBX files will not be imported.");
-		} else {
-			Ref<EditorSceneFormatImporterFBX> importer;
-			importer.instantiate();
-			ResourceImporterScene::add_importer(importer);
-		}
+		Ref<EditorSceneFormatImporterFBX> importer;
+		importer.instantiate();
+		ResourceImporterScene::get_scene_singleton()->add_importer(importer);
+
+		Ref<EditorFileSystemImportFormatSupportQueryFBX> fbx_import_query;
+		fbx_import_query.instantiate();
+		EditorFileSystem::get_singleton()->add_import_format_support_query(fbx_import_query);
 	}
 }
 #endif // TOOLS_ENABLED