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 /core/crypto | |
| parent | 6d8e1aea892dc80e2fb01729b9a532a447f0760d (diff) | |
| parent | ae09b55a19c956cf6dafd446c71178f6bbffd91d (diff) | |
Merge pull request #38032 from reduz/rendering-device-binds
Exposed RenderingDevice to script API
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 ab8548e3ba..233f62bd15 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, bool p_use_sub_threads, float *r_progress) { +RES ResourceFormatLoaderCrypto::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) { String el = p_path.get_extension().to_lower(); if (el == "crt") { diff --git a/core/crypto/crypto.h b/core/crypto/crypto.h index bcae0a8d91..d9becab958 100644 --- a/core/crypto/crypto.h +++ b/core/crypto/crypto.h @@ -85,7 +85,7 @@ public: class ResourceFormatLoaderCrypto : public ResourceFormatLoader { public: - 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; |