From 7da6fcb89e8e09d188dda2fe0974d7ab14ffbe32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= <rverschelde@gmail.com>
Date: Mon, 20 Sep 2021 11:41:01 +0200
Subject: Import: Disable thread import for OBJ meshes

This can currently lead to deadlocks, possibly due to some race condition
in the Vulkan renderer.

Works around #48265.
---
 editor/import/resource_importer_obj.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/editor/import/resource_importer_obj.h b/editor/import/resource_importer_obj.h
index 414e0c1fe6..1bb5ef33ce 100644
--- a/editor/import/resource_importer_obj.h
+++ b/editor/import/resource_importer_obj.h
@@ -64,6 +64,9 @@ public:
 
 	virtual Error import(const String &p_source_file, const String &p_save_path, const Map<StringName, Variant> &p_options, List<String> *r_platform_variants, List<String> *r_gen_files = nullptr, Variant *r_metadata = nullptr) override;
 
+	// Threaded import can currently cause deadlocks, see GH-48265.
+	virtual bool can_import_threaded() const override { return false; }
+
 	ResourceImporterOBJ();
 };
 
-- 
cgit v1.2.3