ソースを参照

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

Juan Linietsky 8 年 前
コミット
d093b78f12
2 ファイル変更3 行追加2 行削除
  1. 2 1
      scene/resources/texture.cpp
  2. 1 1
      scene/resources/texture.h

+ 2 - 1
scene/resources/texture.cpp

@@ -406,7 +406,7 @@ Image::Format StreamTexture::get_format() const {
 	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);
 
@@ -502,6 +502,7 @@ Error StreamTexture::_load_data(const String &p_path, int &tw, int &th, int &fla
 				memdelete(f);
 				ERR_FAIL_COND_V(img->empty(), ERR_FILE_CORRUPT);
 			}
+
 			total_size += img->get_data().size();
 
 			mipmap_images.push_back(img);

+ 1 - 1
scene/resources/texture.h

@@ -170,7 +170,7 @@ public:
 	};
 
 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;
 	RID texture;
 	Image::Format format;