diff options
author | RĂ©mi Verschelde <rverschelde@gmail.com> | 2020-02-28 17:21:16 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-02-28 17:21:16 +0100 |
commit | 620030b600b375545ecab5190615e08919e56da4 (patch) | |
tree | 0ca3e64b0da0edf3d4b1fd14ed558311dd9041e4 /modules/gdnative/nativescript/nativescript.cpp | |
parent | 324e5a60dd068cbbff9c433802f8ecb78cff3364 (diff) | |
parent | 475e4ea67b7e650fd1df01eab6ea659afbc16ec5 (diff) |
Merge pull request #36640 from reduz/resource-loader-refactor
Removed ResourceInteractiveLoader, add built-in threaded loading.
Diffstat (limited to 'modules/gdnative/nativescript/nativescript.cpp')
-rw-r--r-- | modules/gdnative/nativescript/nativescript.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/gdnative/nativescript/nativescript.cpp b/modules/gdnative/nativescript/nativescript.cpp index 0ec6ad71d9..d0e196b3e6 100644 --- a/modules/gdnative/nativescript/nativescript.cpp +++ b/modules/gdnative/nativescript/nativescript.cpp @@ -1931,7 +1931,7 @@ void NativeReloadNode::_notification(int p_what) { #endif } -RES ResourceFormatLoaderNativeScript::load(const String &p_path, const String &p_original_path, Error *r_error) { +RES ResourceFormatLoaderNativeScript::load(const String &p_path, const String &p_original_path, Error *r_error, bool p_use_sub_threads, float *r_progress) { return ResourceFormatLoaderText::singleton->load(p_path, p_original_path, r_error); } |