diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-08-30 00:53:20 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-08-30 00:53:20 +0400 |
commit | 978080707c772158aef380a9c69be1cecaff8aa2 (patch) | |
tree | b689336edb9647035a31927c052e119ca66b0bc4 /intern | |
parent | 02773c7f28616fcccb1ca60d2125c32b9fa86ed8 (diff) |
Fix part of #36594: 16 bit tiff not loading with correct color space in cycles.
Diffstat (limited to 'intern')
-rw-r--r-- | intern/cycles/render/image.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/intern/cycles/render/image.cpp b/intern/cycles/render/image.cpp index 8f33902f961..375d1943436 100644 --- a/intern/cycles/render/image.cpp +++ b/intern/cycles/render/image.cpp @@ -127,10 +127,14 @@ bool ImageManager::is_float_image(const string& filename, void *builtin_data, bo is_linear = !(colorspace == "sRGB" || colorspace == "GammaCorrected" || - strcmp(in->format_name(), "png") == 0); + (colorspace == "" && + (strcmp(in->format_name(), "png") == 0 || + strcmp(in->format_name(), "tiff") == 0 || + strcmp(in->format_name(), "jpeg2000") == 0))); } - else + else { is_linear = false; + } in->close(); } |