[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44056] trunk/blender/source/blender/gpu/ intern/gpu_draw.c: Fix: Check for user preference before applying colour correction on GPU uploaded float textures

[Antony Riakiotakis]

Revision: 44056
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44056
Author:   psy-fi
Date:     2012-02-12 11:50:13 +0000 (Sun, 12 Feb 2012)
Log Message:
-----------
Fix: Check for user preference before applying colour correction on GPU 
uploaded float textures

Modified Paths:
--------------
    trunk/blender/source/blender/gpu/intern/gpu_draw.c

Modified: trunk/blender/source/blender/gpu/intern/gpu_draw.c
===================================================================
--- trunk/blender/source/blender/gpu/intern/gpu_draw.c  2012-02-12 11:42:17 UTC 
(rev 44055)
+++ trunk/blender/source/blender/gpu/intern/gpu_draw.c  2012-02-12 11:50:13 UTC 
(rev 44056)
@@ -473,7 +473,7 @@
                }
 
                /* TODO unneeded when float images are correctly treated as 
linear always */
-               if(ibuf->profile == IB_PROFILE_LINEAR_RGB)
+               if(ibuf->profile == IB_PROFILE_LINEAR_RGB && 
(iuser->scene->r.color_mgt_flag & R_COLOR_MANAGEMENT))
                        do_color_management = TRUE;
 
                if(ibuf->rect==NULL)

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs