diff options
| author | Spartan322 <Megacake1234@gmail.com> | 2024-11-12 13:46:08 -0500 |
|---|---|---|
| committer | Spartan322 <Megacake1234@gmail.com> | 2024-11-12 13:46:59 -0500 |
| commit | 3a73c6ebd18bff0fa125be58d3ac9c7a63bab61d (patch) | |
| tree | c7341bd56c977259578b127886c9a88eeef11820 /editor/import/resource_importer_dynamic_font.h | |
| parent | 5094c2a5f7d506b0e685120f14d1df42e1e9d495 (diff) | |
| parent | cb411fa960f0b7fdbd97dcdb4c90f9346360ee0e (diff) | |
| download | redot-engine-3a73c6ebd18bff0fa125be58d3ac9c7a63bab61d.tar.gz | |
Merge commit godotengine/godot@cb411fa960f0b7fdbd97dcdb4c90f9346360ee0e
Diffstat (limited to 'editor/import/resource_importer_dynamic_font.h')
| -rw-r--r-- | editor/import/resource_importer_dynamic_font.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/editor/import/resource_importer_dynamic_font.h b/editor/import/resource_importer_dynamic_font.h index 48b2df1174..dd90383021 100644 --- a/editor/import/resource_importer_dynamic_font.h +++ b/editor/import/resource_importer_dynamic_font.h @@ -60,7 +60,7 @@ public: bool has_advanced_options() const override; void show_advanced_options(const String &p_path) override; - 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; + virtual Error import(ResourceUID::ID p_source_id, 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; virtual bool can_import_threaded() const override { return true; } |