[Bf-blender-cvs] [4ff4bfc] master: Cycles: DPX is saved in the sRGB space and need to be converted to linear

[Sergey Sharybin]

Commit: 4ff4bfcb9c672ecacd8e5f39df6404a2880ba056
Author: Sergey Sharybin
Date:   Fri Aug 22 23:52:29 2014 +0600
Branches: master
https://developer.blender.org/rB4ff4bfcb9c672ecacd8e5f39df6404a2880ba056

Cycles: DPX is saved in the sRGB space and need to be converted to linear

This at least applies to DPX saved from within blender, which is 1st prio
to support working reliably.

===================================================================

M	intern/cycles/render/image.cpp

===================================================================

diff --git a/intern/cycles/render/image.cpp b/intern/cycles/render/image.cpp
index 5ab9d81..076cc3d 100644
--- a/intern/cycles/render/image.cpp
+++ b/intern/cycles/render/image.cpp
@@ -135,6 +135,7 @@ bool ImageManager::is_float_image(const string& filename, void *builtin_data, bo
 				              (colorspace == "" &&
 				                  (strcmp(in->format_name(), "png") == 0 ||
 				                   strcmp(in->format_name(), "tiff") == 0 ||
+				                   strcmp(in->format_name(), "dpx") == 0 ||
 				                   strcmp(in->format_name(), "jpeg2000") == 0)));
 			}
 			else {