diff options
Diffstat (limited to 'scene/resources/texture.h')
| -rw-r--r-- | scene/resources/texture.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scene/resources/texture.h b/scene/resources/texture.h index b42b770903..237c02a8cd 100644 --- a/scene/resources/texture.h +++ b/scene/resources/texture.h @@ -52,7 +52,7 @@ public: class Texture2D : public Texture { - GDCLASS(Texture2D, Resource); + GDCLASS(Texture2D, Texture); OBJ_SAVE_TYPE(Texture2D); // Saves derived classes with common type so they can be interchanged. protected: @@ -213,7 +213,7 @@ public: class ResourceFormatLoaderStreamTexture : public 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; @@ -350,7 +350,7 @@ public: class TextureLayered : public Texture { - GDCLASS(TextureLayered, Resource); + GDCLASS(TextureLayered, Texture); VS::TextureLayeredType layered_type; @@ -421,7 +421,7 @@ public: COMPRESSION_UNCOMPRESSED }; - 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; |