diff options
| author | Juan Linietsky <juan@godotengine.org> | 2020-02-28 08:27:04 -0300 |
|---|---|---|
| committer | Juan Linietsky <juan@godotengine.org> | 2020-02-28 11:20:45 -0300 |
| commit | 475e4ea67b7e650fd1df01eab6ea659afbc16ec5 (patch) | |
| tree | 9e9603a3bd51a5d31a767334fa413b030a3ed402 /core/io/resource_importer.cpp | |
| parent | 5beccaf86fc89166d0b7d28cfcf719cad8fb30ee (diff) | |
| download | redot-engine-475e4ea67b7e650fd1df01eab6ea659afbc16ec5.tar.gz | |
Removed interactive loader, added proper thread loading.
Diffstat (limited to 'core/io/resource_importer.cpp')
| -rw-r--r-- | core/io/resource_importer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/io/resource_importer.cpp b/core/io/resource_importer.cpp index f147170ff7..efaf958949 100644 --- a/core/io/resource_importer.cpp +++ b/core/io/resource_importer.cpp @@ -117,7 +117,7 @@ Error ResourceFormatImporter::_get_path_and_type(const String &p_path, PathAndTy return OK; } -RES ResourceFormatImporter::load(const String &p_path, const String &p_original_path, Error *r_error) { +RES ResourceFormatImporter::load(const String &p_path, const String &p_original_path, Error *r_error, bool p_use_sub_threads, float *r_progress) { PathAndType pat; Error err = _get_path_and_type(p_path, pat); @@ -130,7 +130,7 @@ RES ResourceFormatImporter::load(const String &p_path, const String &p_original_ return RES(); } - RES res = ResourceLoader::_load(pat.path, p_path, pat.type, false, r_error); + RES res = ResourceLoader::_load(pat.path, p_path, pat.type, false, r_error, p_use_sub_threads, r_progress); #ifdef TOOLS_ENABLED if (res.is_valid()) { |