Browse Source

Merge pull request #52865 from akien-mga/obj-import-no-threads

Import: Disable thread import for OBJ meshes
Rémi Verschelde 4 years ago
parent
commit
327ab9d9f5
1 changed files with 3 additions and 0 deletions
  1. 3 0
      editor/import/resource_importer_obj.h

+ 3 - 0
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();
 };