diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2021-09-20 11:41:01 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2021-09-20 11:57:16 +0200 |
| commit | 7da6fcb89e8e09d188dda2fe0974d7ab14ffbe32 (patch) | |
| tree | c8d79dd0c6d6676ea8594b6587b165c20b999208 /editor/import/resource_importer_obj.h | |
| parent | 1e93e3fc491e8780722fc2324f2c0c42ea8913df (diff) | |
| download | redot-engine-7da6fcb89e8e09d188dda2fe0974d7ab14ffbe32.tar.gz | |
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.
Diffstat (limited to 'editor/import/resource_importer_obj.h')
| -rw-r--r-- | editor/import/resource_importer_obj.h | 3 |
1 files changed, 3 insertions, 0 deletions
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(); }; |