godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix stex import into black textures when lossless and lossy are selected, closes #8801

Browse Source
This commit is contained in:
Juan Linietsky 2017-05-23 08:55:32 -03:00
parent 6161e731d0
commit d093b78f12
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scene/resources/texture.cpp
View File

@ -406,7 +406,7 @@ Image::Format StreamTexture::get_format() const {
return format; return format;
} }
Error StreamTexture::_load_data(const String &p_path, int &tw, int &th, int &flags, Ref<Image> image, int p_size_limit) { Error StreamTexture::_load_data(const String &p_path, int &tw, int &th, int &flags, Ref<Image> &image, int p_size_limit) {
ERR_FAIL_COND_V(image.is_null(), ERR_INVALID_PARAMETER); ERR_FAIL_COND_V(image.is_null(), ERR_INVALID_PARAMETER);
@ -502,6 +502,7 @@ Error StreamTexture::_load_data(const String &p_path, int &tw, int &th, int &fla
memdelete(f); memdelete(f);
ERR_FAIL_COND_V(img->empty(), ERR_FILE_CORRUPT); ERR_FAIL_COND_V(img->empty(), ERR_FILE_CORRUPT);
} }
total_size += img->get_data().size(); total_size += img->get_data().size();
mipmap_images.push_back(img); mipmap_images.push_back(img);

2
scene/resources/texture.h
View File

@ -170,7 +170,7 @@ public:
}; };
private: private:
Error _load_data(const String &p_path, int &tw, int &th, int &flags, Ref<Image> image, int p_size_limit = 0); Error _load_data(const String &p_path, int &tw, int &th, int &flags, Ref<Image> &image, int p_size_limit = 0);
String path_to_file; String path_to_file;
RID texture; RID texture;
Image::Format format; Image::Format format;