[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60492] trunk/blender/source/blender/ editors/render/render_internal.c: Fix blender internal viewport render not using color management settings like

[Brecht Van Lommel]

Revision: 60492
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60492
Author:   blendix
Date:     2013-10-01 15:34:43 +0000 (Tue, 01 Oct 2013)
Log Message:
-----------
Fix blender internal viewport render not using color management settings like
view, exposure, looks.

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

Modified: trunk/blender/source/blender/editors/render/render_internal.c
===================================================================
--- trunk/blender/source/blender/editors/render/render_internal.c	2013-10-01 15:04:58 UTC (rev 60491)
+++ trunk/blender/source/blender/editors/render/render_internal.c	2013-10-01 15:34:43 UTC (rev 60492)
@@ -1152,7 +1152,7 @@
 
 		/* Try using GLSL display transform. */
 		if (force_fallback == false) {
-			if (IMB_colormanagement_setup_glsl_draw(NULL, &scene->display_settings, true, false)) {
+			if (IMB_colormanagement_setup_glsl_draw(&scene->view_settings, &scene->display_settings, true, false)) {
 				glEnable(GL_BLEND);
 				glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
 				glaDrawPixelsTex(rres.xof, rres.yof, rres.rectx, rres.recty, GL_RGBA, GL_FLOAT,
@@ -1170,7 +1170,7 @@
 			                                            "render_view3d_draw");
 
 			IMB_colormanagement_buffer_make_display_space(rres.rectf, display_buffer, rres.rectx, rres.recty,
-			                                              4, dither, NULL, &scene->display_settings);
+			                                              4, dither, &scene->view_settings, &scene->display_settings);
 
 			glEnable(GL_BLEND);
 			glColor4f(1.0f, 1.0f, 1.0f, 1.0f);