sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix part of #36594: 16 bit tiff not loading with correct color space in cycles.

Browse Source
This commit is contained in:
Brecht Van Lommel 2013-08-29 20:53:20 +00:00
parent 02773c7f28
commit 978080707c
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
intern/cycles/render/image.cpp
View File

@ -127,10 +127,14 @@ bool ImageManager::is_float_image(const string& filename, void *builtin_data, bo
is_linear = !(colorspace == "sRGB" || is_linear = !(colorspace == "sRGB" ||
colorspace == "GammaCorrected" || 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; is_linear = false;
}
in->close(); in->close();
} }