diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-09-20 12:33:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-20 12:33:46 +0200 |
| commit | 327ab9d9f589e848217bd13193f7b051cd485bf9 (patch) | |
| tree | 77baf5c896198fd956154e52f49edeb1c6c703b9 /editor | |
| parent | aa463ffb561e75d3fe0ea759d62f7e025a4205b5 (diff) | |
| parent | 7da6fcb89e8e09d188dda2fe0974d7ab14ffbe32 (diff) | |
Merge pull request #52865 from akien-mga/obj-import-no-threads
Import: Disable thread import for OBJ meshes
Diffstat (limited to 'editor')
| -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(); }; |