diff options
| author | Spartan322 <Megacake1234@gmail.com> | 2024-11-11 09:07:04 -0500 |
|---|---|---|
| committer | Spartan322 <Megacake1234@gmail.com> | 2024-11-11 09:08:01 -0500 |
| commit | 62fbec9f6f0722a1f9825c17f073742932082228 (patch) | |
| tree | a10abf56ba93705731da1aaf338f2cf21403c6ad /editor/import/3d/resource_importer_obj.h | |
| parent | e7894c2c4efdd51049a21af4892005381fe57cd6 (diff) | |
| parent | 0f5f3bc9546b46b2029fc8896dc859697f1eab97 (diff) | |
| download | redot-engine-62fbec9f6f0722a1f9825c17f073742932082228.tar.gz | |
Merge commit godotengine/godot@0f5f3bc9546b46b2029fc8896dc859697f1eab97
Diffstat (limited to 'editor/import/3d/resource_importer_obj.h')
| -rw-r--r-- | editor/import/3d/resource_importer_obj.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/editor/import/3d/resource_importer_obj.h b/editor/import/3d/resource_importer_obj.h index 53c8f65974..74f0e2db54 100644 --- a/editor/import/3d/resource_importer_obj.h +++ b/editor/import/3d/resource_importer_obj.h @@ -65,9 +65,6 @@ public: virtual Error import(const String &p_source_file, const String &p_save_path, const HashMap<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(); }; |