[Bf-blender-cvs] [cb2f5d498e4] master: Fix T74119: Cycles Viewport Render Tint

[Jeroen Bakker]

Commit: cb2f5d498e450da0b2f26702ed4d2691d9ee3750
Author: Jeroen Bakker
Date:   Mon Feb 24 13:53:34 2020 +0100
Branches: master
https://developer.blender.org/rBcb2f5d498e450da0b2f26702ed4d2691d9ee3750

Fix T74119: Cycles Viewport Render Tint

Cycles uses the display_space_shader it gets from Blender. When
requested the shader used to be a GPU_SHADER_2D_IMAGE_COLOR, which
set the `color` uniform incorrectly. This resulted in a yellowish tint
when used.

To fix this the `GPU_SHADER_2D_IMAGE` shader will be used.

Reviewed By: brecht, fclem

Maniphest Tasks: T74119

Differential Revision: https://developer.blender.org/D6921

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

M	source/blender/makesrna/intern/rna_render.c

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

diff --git a/source/blender/makesrna/intern/rna_render.c b/source/blender/makesrna/intern/rna_render.c
index a3cf6fcd0b7..2031c444c9a 100644
--- a/source/blender/makesrna/intern/rna_render.c
+++ b/source/blender/makesrna/intern/rna_render.c
@@ -128,14 +128,12 @@ static int engine_get_preview_pixel_size(RenderEngine *UNUSED(engine), Scene *sc
 
 static void engine_bind_display_space_shader(RenderEngine *UNUSED(engine), Scene *UNUSED(scene))
 {
-  GPUShader *shader = GPU_shader_get_builtin_shader(GPU_SHADER_2D_IMAGE_COLOR);
+  GPUShader *shader = GPU_shader_get_builtin_shader(GPU_SHADER_2D_IMAGE);
   GPU_shader_bind(shader);
 
   int img_loc = GPU_shader_get_uniform_ensure(shader, "image");
-  int color_loc = GPU_shader_get_uniform_ensure(shader, "color");
 
   GPU_shader_uniform_int(shader, img_loc, 0);
-  GPU_shader_uniform_vector(shader, color_loc, 3, 1, (float[3]){1.0f, 1.0f, 1.0f});
 }
 
 static void engine_unbind_display_space_shader(RenderEngine *UNUSED(engine))