diff options
| author | Valdemar Lindberg <Voldie> | 2020-12-11 21:08:45 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2020-12-11 21:36:09 +0300 |
| commit | 93c67b0b8e20a1da514f2dc7e53bac8506dd3aaa (patch) | |
| tree | c6ebe01664d46e35f324370a39a2ac79f6bfec61 /intern | |
| parent | 97651f428b6ae6901cbacd9805616fe96052bc9b (diff) | |
Fix T83586: Cycles failing to load OpenEXR image with EXR RGBAZ channels
Don't refuse to load 5-channel images, instead drop any channels after the 4th
and hope that the first channels represent RGBA.
Differential Revision: https://developer.blender.org/D9820
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/render/image.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/render/image.cpp b/intern/cycles/render/image.cpp index 3e6ff289c85..30858c4f68b 100644 --- a/intern/cycles/render/image.cpp +++ b/intern/cycles/render/image.cpp @@ -493,8 +493,8 @@ static bool image_associate_alpha(ImageManager::Image *img) template<TypeDesc::BASETYPE FileFormat, typename StorageType> bool ImageManager::file_load_image(Image *img, int texture_limit) { - /* we only handle certain number of components */ - if (!(img->metadata.channels >= 1 && img->metadata.channels <= 4)) { + /* Ignore empty images. */ + if (!(img->metadata.channels > 0)) { return false; } |