[Bf-blender-cvs] [df58d6bf76e] blender2.8: Fix T52046: View transform applied twice w/ GL render

[Campbell Barton]

Commit: df58d6bf76e6551e26fe64480b842f0e18b75e4b
Author: Campbell Barton
Date:   Fri Sep 8 03:52:31 2017 +1000
Branches: blender2.8
https://developer.blender.org/rBdf58d6bf76e6551e26fe64480b842f0e18b75e4b

Fix T52046: View transform applied twice w/ GL render

Patch from @sergey w/ minor edit.

===================================================================

M	source/blender/draw/intern/draw_manager.c

===================================================================

diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c
index 94079f3a1e6..601ea35f8c1 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -2388,8 +2388,12 @@ void DRW_transform_to_display(GPUTexture *tex)
 
 	{
 		Scene *scene = DST.draw_ctx.scene;
+		/* View transform is already applied for offscreen, don't apply again, see: T52046 */
+		ColorManagedViewSettings *view_settings =
+		        (DST.options.is_image_render && !DST.options.is_scene_render) ?
+		        NULL : &scene->view_settings;
 		use_ocio = IMB_colormanagement_setup_glsl_draw_from_space(
-		        &scene->view_settings, &scene->display_settings, NULL, dither, false);
+		        view_settings, &scene->display_settings, NULL, dither, false);
 	}
 
 	if (!use_ocio) {