[Bf-blender-cvs] [cb826f35293] temp-texture-painting-gpu: Change merge shader to not fade.

[Jeroen Bakker]

Commit: cb826f352938be3256113cc5043162b89a2494f9
Author: Jeroen Bakker
Date:   Fri Sep 30 15:50:11 2022 +0200
Branches: temp-texture-painting-gpu
https://developer.blender.org/rBcb826f352938be3256113cc5043162b89a2494f9

Change merge shader to not fade.

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

M	source/blender/gpu/shaders/sculpt_paint/sculpt_paint_image_merge_comp.glsl

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

diff --git a/source/blender/gpu/shaders/sculpt_paint/sculpt_paint_image_merge_comp.glsl b/source/blender/gpu/shaders/sculpt_paint/sculpt_paint_image_merge_comp.glsl
index 4d6f42ed860..80762e1d2df 100644
--- a/source/blender/gpu/shaders/sculpt_paint/sculpt_paint_image_merge_comp.glsl
+++ b/source/blender/gpu/shaders/sculpt_paint/sculpt_paint_image_merge_comp.glsl
@@ -3,7 +3,8 @@ void main()
   ivec2 coord_in = ivec2(gl_GlobalInvocationID.xy);
   ivec2 coord_out = coord_in;
   vec4 paint_color = imageLoad(in_paint_img, coord_in);
+  paint_color.a = 1.0;
   vec4 canvas_color = imageLoad(out_img, coord_out);
-  vec4 out_color = mix(canvas_color, paint_color, 0.01);
+  vec4 out_color = max(canvas_color, paint_color);
   imageStore(out_img, coord_out, out_color);
 }
\ No newline at end of file