diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-08-25 16:51:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-25 16:51:26 +0200 |
| commit | 0cf0e960387620e6a206b5417b25aca008788043 (patch) | |
| tree | 26e9fe00f0ff3ae580c58aeb3f95d2fbf45642be /modules/tinyexr/image_loader_tinyexr.cpp | |
| parent | cfcdd576dd14fa98bc8404f4091f2f54eece3d87 (diff) | |
| parent | 672e9d6868dd422f87fdbf69e6b7f0ecd84c4b64 (diff) | |
| download | redot-engine-0cf0e960387620e6a206b5417b25aca008788043.tar.gz | |
Merge pull request #64776 from YuriSizov/import-images-moar-flags
Diffstat (limited to 'modules/tinyexr/image_loader_tinyexr.cpp')
| -rw-r--r-- | modules/tinyexr/image_loader_tinyexr.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/tinyexr/image_loader_tinyexr.cpp b/modules/tinyexr/image_loader_tinyexr.cpp index 864df765ee..6f61251f9b 100644 --- a/modules/tinyexr/image_loader_tinyexr.cpp +++ b/modules/tinyexr/image_loader_tinyexr.cpp @@ -37,7 +37,7 @@ #include "thirdparty/tinyexr/tinyexr.h" -Error ImageLoaderTinyEXR::load_image(Ref<Image> p_image, Ref<FileAccess> f, bool p_force_linear, float p_scale) { +Error ImageLoaderTinyEXR::load_image(Ref<Image> p_image, Ref<FileAccess> f, uint32_t p_flags, float p_scale) { Vector<uint8_t> src_image; uint64_t src_image_len = f->get_length(); ERR_FAIL_COND_V(src_image_len == 0, ERR_FILE_CORRUPT); @@ -229,7 +229,7 @@ Error ImageLoaderTinyEXR::load_image(Ref<Image> p_image, Ref<FileAccess> f, bool color.a = *a_channel++; } - if (p_force_linear) { + if (p_flags & FLAG_FORCE_LINEAR) { color = color.srgb_to_linear(); } @@ -260,7 +260,7 @@ Error ImageLoaderTinyEXR::load_image(Ref<Image> p_image, Ref<FileAccess> f, bool color.a = *a_channel++; } - if (p_force_linear) { + if (p_flags & FLAG_FORCE_LINEAR) { color = color.srgb_to_linear(); } |