[Bf-blender-cvs] [1cb74768c12] master: GPencil: Remove wrong premult in Blend shader

Antonioya noreply at git.blender.org
Thu May 30 13:23:31 CEST 2019


Commit: 1cb74768c12b0cd668f88af4ad8fe1598a5d44e9
Author: Antonioya
Date:   Thu May 30 12:05:25 2019 +0200
Branches: master
https://developer.blender.org/rB1cb74768c12b0cd668f88af4ad8fe1598a5d44e9

GPencil: Remove wrong premult in Blend shader

The process was doing two times the same and the alpha was totally wrong.

Related to T65279

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

M	source/blender/draw/engines/gpencil/shaders/gpencil_blend_frag.glsl

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

diff --git a/source/blender/draw/engines/gpencil/shaders/gpencil_blend_frag.glsl b/source/blender/draw/engines/gpencil/shaders/gpencil_blend_frag.glsl
index d415ce53137..73aed062cf1 100644
--- a/source/blender/draw/engines/gpencil/shaders/gpencil_blend_frag.glsl
+++ b/source/blender/draw/engines/gpencil/shaders/gpencil_blend_frag.glsl
@@ -111,14 +111,6 @@ void main()
   vec4 mix_color = texelFetch(blendColor, uv, 0).rgba;
   float mix_depth = texelFetch(blendDepth, uv, 0).r;
 
-  /* premult alpha factor to remove double blend effects */
-  if (stroke_color.a > 0) {
-    stroke_color = vec4(vec3(stroke_color.rgb / stroke_color.a), stroke_color.a);
-  }
-  if (mix_color.a > 0) {
-    mix_color = vec4(vec3(mix_color.rgb / mix_color.a), mix_color.a);
-  }
-
   /* Normal mode */
   if (mode == MODE_NORMAL) {
     if (stroke_color.a > 0) {



More information about the Bf-blender-cvs mailing list