diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2020-04-20 22:03:11 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-20 22:03:11 -0300 |
| commit | 40b2aea222807ab50a31c7ca718bfca76080caa0 (patch) | |
| tree | 94c9b2cc850eb2fb0608a52c05fb389e1cd35234 /modules/gdnative/pluginscript | |
| parent | 6d8e1aea892dc80e2fb01729b9a532a447f0760d (diff) | |
| parent | ae09b55a19c956cf6dafd446c71178f6bbffd91d (diff) | |
| download | redot-engine-40b2aea222807ab50a31c7ca718bfca76080caa0.tar.gz | |
Merge pull request #38032 from reduz/rendering-device-binds
Exposed RenderingDevice to script API
Diffstat (limited to 'modules/gdnative/pluginscript')
| -rw-r--r-- | modules/gdnative/pluginscript/pluginscript_loader.cpp | 2 | ||||
| -rw-r--r-- | modules/gdnative/pluginscript/pluginscript_loader.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/gdnative/pluginscript/pluginscript_loader.cpp b/modules/gdnative/pluginscript/pluginscript_loader.cpp index 3fb22b3f8d..64582cc517 100644 --- a/modules/gdnative/pluginscript/pluginscript_loader.cpp +++ b/modules/gdnative/pluginscript/pluginscript_loader.cpp @@ -39,7 +39,7 @@ ResourceFormatLoaderPluginScript::ResourceFormatLoaderPluginScript(PluginScriptL _language = language; } -RES ResourceFormatLoaderPluginScript::load(const String &p_path, const String &p_original_path, Error *r_error, bool p_use_sub_threads, float *r_progress) { +RES ResourceFormatLoaderPluginScript::load(const String &p_path, const String &p_original_path, Error *r_error, bool p_use_sub_threads, float *r_progress, bool p_no_cache) { if (r_error) *r_error = ERR_FILE_CANT_OPEN; diff --git a/modules/gdnative/pluginscript/pluginscript_loader.h b/modules/gdnative/pluginscript/pluginscript_loader.h index c929be53bd..e47754490a 100644 --- a/modules/gdnative/pluginscript/pluginscript_loader.h +++ b/modules/gdnative/pluginscript/pluginscript_loader.h @@ -44,7 +44,7 @@ class ResourceFormatLoaderPluginScript : public ResourceFormatLoader { public: ResourceFormatLoaderPluginScript(PluginScriptLanguage *language); - virtual RES load(const String &p_path, const String &p_original_path = "", Error *r_error = nullptr, bool p_use_sub_threads = false, float *r_progress = nullptr); + virtual RES load(const String &p_path, const String &p_original_path = "", Error *r_error = nullptr, bool p_use_sub_threads = false, float *r_progress = nullptr, bool p_no_cache = false); 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; |