[Bf-blender-cvs] [29b4dc1d162] greasepencil-refactor: GPencil: Refactor: Fix overlay blending math

Clément Foucault noreply at git.blender.org
Fri Dec 13 20:18:35 CET 2019


Commit: 29b4dc1d162868e384fdc0d7c383f2c9c44912a9
Author: Clément Foucault
Date:   Fri Dec 13 20:18:29 2019 +0100
Branches: greasepencil-refactor
https://developer.blender.org/rB29b4dc1d162868e384fdc0d7c383f2c9c44912a9

GPencil: Refactor: Fix overlay blending math

A sign error in optimized code.

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

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

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

diff --git a/source/blender/draw/engines/gpencil/shaders/gpencil_layer_blend_frag.glsl b/source/blender/draw/engines/gpencil/shaders/gpencil_layer_blend_frag.glsl
index e0f1ac30827..88d700ac3f4 100644
--- a/source/blender/draw/engines/gpencil/shaders/gpencil_layer_blend_frag.glsl
+++ b/source/blender/draw/engines/gpencil/shaders/gpencil_layer_blend_frag.glsl
@@ -64,7 +64,7 @@ void main()
        **/
       color = mix(vec4(0.5), color, color.a * blendOpacity);
       vec4 s = step(0.5, color);
-      fragRevealage = fragColor = 2.0 * s + 2.0 * color * (s * 2.0 - 1.0);
+      fragRevealage = fragColor = 2.0 * s + 2.0 * color * (1.0 - s * 2.0);
       break;
     case MODE_OVERLAY_SECOND_PASS:
       /* Reminder: Blending func is additive blend (dst.rgba + src.rgba).*/



More information about the Bf-blender-cvs mailing list