[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51370] trunk/blender/source/blender/ render/intern/source/rendercore.c: Color Management: texture baking should be correct when color management is disabled

[Sergey Sharybin]

Revision: 51370
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51370
Author:   nazgul
Date:     2012-10-16 15:20:18 +0000 (Tue, 16 Oct 2012)
Log Message:
-----------
Color Management: texture baking should be correct when color management is disabled

Modified Paths:
--------------
    trunk/blender/source/blender/render/intern/source/rendercore.c

Modified: trunk/blender/source/blender/render/intern/source/rendercore.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/rendercore.c	2012-10-16 15:07:01 UTC (rev 51369)
+++ trunk/blender/source/blender/render/intern/source/rendercore.c	2012-10-16 15:20:18 UTC (rev 51370)
@@ -2224,7 +2224,8 @@
 			float rgb[3];
 
 			copy_v3_v3(rgb, shr.combined);
-			IMB_colormanagement_scene_linear_to_colorspace_v3(rgb, bs->rect_colorspace);
+			if (R.scene_color_manage)
+				IMB_colormanagement_scene_linear_to_colorspace_v3(rgb, bs->rect_colorspace);
 			rgb_float_to_uchar(col, rgb);
 		}
 		else {