Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-10 22:23:07 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #63271 from Chaosus/fix_texture_error

Browse Source 
Fix error emitting when opening some textures in the inspector
This commit is contained in:
Rémi Verschelde 2022-10-11 16:17:15 +02:00
commit 646d59e713
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scene/resources/texture.h
View File

@ -238,7 +238,7 @@ private:
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;
Image::Format format = Image::FORMAT_L8;
int w = 0;
int h = 0;
mutable Ref<BitMap> alpha_cache;
@ -415,7 +415,7 @@ class ImageTextureLayered : public TextureLayered {
LayeredType layered_type;
mutable RID texture;
Image::Format format = Image::FORMAT_MAX;
Image::Format format = Image::FORMAT_L8;
int width = 0;
int height = 0;
@ -495,7 +495,7 @@ private:
Error _load_data(const String &p_path, Vector<Ref<Image>> &images, int &mipmap_limit, int p_size_limit = 0);
String path_to_file;
mutable RID texture;
Image::Format format = Image::FORMAT_MAX;
Image::Format format = Image::FORMAT_L8;
int w = 0;
int h = 0;
int layers = 0;
@ -587,7 +587,7 @@ class ImageTexture3D : public Texture3D {
mutable RID texture;
Image::Format format = Image::FORMAT_MAX;
Image::Format format = Image::FORMAT_L8;
int width = 1;
int height = 1;
int depth = 1;
@ -641,7 +641,7 @@ private:
Error _load_data(const String &p_path, Vector<Ref<Image>> &r_data, Image::Format &r_format, int &r_width, int &r_height, int &r_depth, bool &r_mipmaps);
String path_to_file;
mutable RID texture;
Image::Format format = Image::FORMAT_MAX;
Image::Format format = Image::FORMAT_L8;
int w = 0;
int h = 0;
int d = 0;