diff options
| author | Juan Linietsky | 2017-05-29 22:11:33 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2017-05-30 08:56:19 -0300 |
| commit | 5567e898d1052c1e2c2d32d3c37dfd957f4dc4bd (patch) | |
| tree | e0df9b88b6c485f846dab9ae51369288f191cab8 /core/io/image_loader.cpp | |
| parent | 0a6faeb4f5914061c29d946eaa29f2c50b8472fb (diff) | |
| download | godot-5567e898d1052c1e2c2d32d3c37dfd957f4dc4bd.tar.gz godot-5567e898d1052c1e2c2d32d3c37dfd957f4dc4bd.tar.zst godot-5567e898d1052c1e2c2d32d3c37dfd957f4dc4bd.zip | |
Several fixes related to PBR and Environment
Diffstat (limited to 'core/io/image_loader.cpp')
| -rw-r--r-- | core/io/image_loader.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/io/image_loader.cpp b/core/io/image_loader.cpp index 6ed20ac01..23719940b 100644 --- a/core/io/image_loader.cpp +++ b/core/io/image_loader.cpp @@ -43,7 +43,7 @@ bool ImageFormatLoader::recognize(const String &p_extension) const { return false; } -Error ImageLoader::load_image(String p_file, Ref<Image> p_image, FileAccess *p_custom) { +Error ImageLoader::load_image(String p_file, Ref<Image> p_image, FileAccess *p_custom, bool p_force_linear) { ERR_FAIL_COND_V(p_image.is_null(), ERR_INVALID_PARAMETER); FileAccess *f = p_custom; @@ -62,7 +62,7 @@ Error ImageLoader::load_image(String p_file, Ref<Image> p_image, FileAccess *p_c if (!loader[i]->recognize(extension)) continue; - Error err = loader[i]->load_image(p_image, f); + Error err = loader[i]->load_image(p_image, f, p_force_linear); if (err != ERR_FILE_UNRECOGNIZED) { |