[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57999] trunk/blender/source/blender/ render/intern/source/convertblender.c: Fix #35957: blender internal viewport render did not do correct color management

[Brecht Van Lommel]

Revision: 57999
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57999
Author:   blendix
Date:     2013-07-04 18:17:02 +0000 (Thu, 04 Jul 2013)
Log Message:
-----------
Fix #35957: blender internal viewport render did not do correct color management
for image textures.

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

Modified: trunk/blender/source/blender/render/intern/source/convertblender.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/convertblender.c	2013-07-04 17:57:03 UTC (rev 57998)
+++ trunk/blender/source/blender/render/intern/source/convertblender.c	2013-07-04 18:17:02 UTC (rev 57999)
@@ -5247,6 +5247,9 @@
 	re->main= bmain;
 	re->scene= scene;
 	re->lay= lay;
+
+	if(re->r.scemode & R_VIEWPORT_PREVIEW)
+		re->scene_color_manage = BKE_scene_check_color_management_enabled(scene);
 	
 	/* scene needs to be set to get camera */
 	camera= RE_GetCamera(re);