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/crypto | |
| parent | 5beccaf86fc89166d0b7d28cfcf719cad8fb30ee (diff) | |
Removed interactive loader, added proper thread loading.
Diffstat (limited to 'core/crypto')
| -rw-r--r-- | core/crypto/crypto.cpp | 2 | ||||
| -rw-r--r-- | core/crypto/crypto.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/crypto/crypto.cpp b/core/crypto/crypto.cpp index 3711b26e47..793bf719b7 100644 --- a/core/crypto/crypto.cpp +++ b/core/crypto/crypto.cpp @@ -99,7 +99,7 @@ Crypto::Crypto() { /// Resource loader/saver -RES ResourceFormatLoaderCrypto::load(const String &p_path, const String &p_original_path, Error *r_error) { +RES ResourceFormatLoaderCrypto::load(const String &p_path, const String &p_original_path, Error *r_error, bool p_use_sub_threads, float *r_progress) { String el = p_path.get_extension().to_lower(); if (el == "crt") { diff --git a/core/crypto/crypto.h b/core/crypto/crypto.h index babd0bc4eb..3279c0620f 100644 --- a/core/crypto/crypto.h +++ b/core/crypto/crypto.h @@ -87,7 +87,7 @@ class ResourceFormatLoaderCrypto : public ResourceFormatLoader { GDCLASS(ResourceFormatLoaderCrypto, ResourceFormatLoader); public: - virtual RES load(const String &p_path, const String &p_original_path = "", Error *r_error = NULL); + virtual RES load(const String &p_path, const String &p_original_path = "", Error *r_error = NULL, bool p_use_sub_threads = false, float *r_progress = nullptr); virtual void get_recognized_extensions(List<String> *p_extensions) const; virtual bool handles_type(const String &p_type) const; virtual String get_resource_type(const String &p_path) const; |