[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59643] trunk/blender/intern/cycles/render /image.cpp: Fix part of #36594: 16 bit tiff not loading with correct color space in cycles.

[Brecht Van Lommel]

Revision: 59643
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59643
Author:   blendix
Date:     2013-08-29 20:53:20 +0000 (Thu, 29 Aug 2013)
Log Message:
-----------
Fix part of #36594: 16 bit tiff not loading with correct color space in cycles.

Modified Paths:
--------------
    trunk/blender/intern/cycles/render/image.cpp

Modified: trunk/blender/intern/cycles/render/image.cpp
===================================================================
--- trunk/blender/intern/cycles/render/image.cpp	2013-08-29 19:02:07 UTC (rev 59642)
+++ trunk/blender/intern/cycles/render/image.cpp	2013-08-29 20:53:20 UTC (rev 59643)
@@ -127,10 +127,14 @@
 
 				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();
 		}