summaryrefslogtreecommitdiffstats
path: root/core/crypto/crypto.cpp
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2020-02-28 17:21:16 +0100
committerGitHub <noreply@github.com>2020-02-28 17:21:16 +0100
commit620030b600b375545ecab5190615e08919e56da4 (patch)
tree0ca3e64b0da0edf3d4b1fd14ed558311dd9041e4 /core/crypto/crypto.cpp
parent324e5a60dd068cbbff9c433802f8ecb78cff3364 (diff)
parent475e4ea67b7e650fd1df01eab6ea659afbc16ec5 (diff)
downloadredot-engine-620030b600b375545ecab5190615e08919e56da4.tar.gz
Merge pull request #36640 from reduz/resource-loader-refactor
Removed ResourceInteractiveLoader, add built-in threaded loading.
Diffstat (limited to 'core/crypto/crypto.cpp')
-rw-r--r--core/crypto/crypto.cpp2
1 files changed, 1 insertions, 1 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") {