[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57720] trunk/blender/source/blender/ editors/render/render_opengl.c: Fix OpenGL render not working correct with display color space set to None

[Brecht Van Lommel]

Revision: 57720
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57720
Author:   blendix
Date:     2013-06-24 23:24:39 +0000 (Mon, 24 Jun 2013)
Log Message:
-----------
Fix OpenGL render not working correct with display color space set to None
(color management off).

Modified Paths:
--------------
    trunk/blender/source/blender/editors/render/render_opengl.c

Modified: trunk/blender/source/blender/editors/render/render_opengl.c
===================================================================
--- trunk/blender/source/blender/editors/render/render_opengl.c 2013-06-24 
23:13:40 UTC (rev 57719)
+++ trunk/blender/source/blender/editors/render/render_opengl.c 2013-06-24 
23:24:39 UTC (rev 57720)
@@ -269,10 +269,17 @@
         */
 
        if (rect) {
+               int profile_to;
+               
+               if(BKE_scene_check_color_management_enabled(scene))
+                       profile_to = IB_PROFILE_LINEAR_RGB;
+               else
+                       profile_to = IB_PROFILE_SRGB;
+
                /* sequencer has got trickier conversion happened above
                 * also assume opengl's space matches byte buffer color space */
                IMB_buffer_float_from_byte(rr->rectf, rect,
-                                          IB_PROFILE_LINEAR_RGB, 
IB_PROFILE_SRGB, true,
+                                          profile_to, IB_PROFILE_SRGB, true,
                                           oglrender->sizex, oglrender->sizey, 
oglrender->sizex, oglrender->sizex);
        }
 

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