[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26066] trunk/blender/source/blender/ render/intern/source/pipeline.c: Fix [#20702] Problems with Colormanagement

[Matt Ebb]

Revision: 26066
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26066
Author:   broken
Date:     2010-01-18 03:10:55 +0100 (Mon, 18 Jan 2010)

Log Message:
-----------
Fix [#20702] Problems with Colormanagement

Own bug in previous fix here..

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

Modified: trunk/blender/source/blender/render/intern/source/pipeline.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/pipeline.c	2010-01-18 01:59:16 UTC (rev 26065)
+++ trunk/blender/source/blender/render/intern/source/pipeline.c	2010-01-18 02:10:55 UTC (rev 26066)
@@ -2804,7 +2804,8 @@
 			/* float factor for random dither, imbuf takes care of it */
 			ibuf->dither= scene->r.dither_intensity;
 			/* prepare to gamma correct to sRGB color space */
-			ibuf->profile = IB_PROFILE_LINEAR_RGB;
+			if (scene->r.color_mgt_flag & R_COLOR_MANAGEMENT)
+				ibuf->profile = IB_PROFILE_LINEAR_RGB;
 
 			ok= BKE_write_ibuf(scene, ibuf, name, scene->r.imtype, scene->r.subimtype, scene->r.quality);