diff options
author | Rémi Verschelde <remi@verschelde.fr> | 2021-06-01 10:47:37 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-06-01 10:47:37 +0200 |
commit | 59b524ae4c1d81150d88fa9618f8f33c1cf6b6ea (patch) | |
tree | 50530c40716fa3e5a45c403f106b407e120757f1 /scene/resources/texture.h | |
parent | 5ec8920cde0cf5aafda59dfda335772acf3fcd15 (diff) | |
parent | f8e34209afbf5c862c9638c8029dbfc1be67a30c (diff) |
Merge pull request #49067 from JFonS/fix_gcc_warnings
Fix some warnings raised by GCC-11.1
Diffstat (limited to 'scene/resources/texture.h')
-rw-r--r-- | scene/resources/texture.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/resources/texture.h b/scene/resources/texture.h index 264d85d187..df8c00f8ff 100644 --- a/scene/resources/texture.h +++ b/scene/resources/texture.h @@ -158,7 +158,7 @@ public: }; private: - Error _load_data(const String &p_path, int &tw, int &th, int &tw_custom, int &th_custom, Ref<Image> &image, bool &r_request_3d, bool &r_request_normal, bool &r_request_roughness, int &mipmap_limit, int p_size_limit = 0); + Error _load_data(const String &p_path, int &r_width, int &r_height, Ref<Image> &image, bool &r_request_3d, bool &r_request_normal, bool &r_request_roughness, int &mipmap_limit, int p_size_limit = 0); String path_to_file; mutable RID texture; Image::Format format = Image::FORMAT_MAX; |