[Bf-blender-cvs] [5d8ed832a4c] greasepencil-refactor: GPencil: Refactor: Fix mask blending
Clément Foucault
noreply at git.blender.org
Mon Dec 16 02:14:15 CET 2019
Commit: 5d8ed832a4c17ee94c57ca52d409339e00f5810b
Author: Clément Foucault
Date: Mon Dec 16 01:18:32 2019 +0100
Branches: greasepencil-refactor
https://developer.blender.org/rB5d8ed832a4c17ee94c57ca52d409339e00f5810b
GPencil: Refactor: Fix mask blending
===================================================================
M source/blender/draw/engines/gpencil/shaders/gpencil_layer_mask_frag.glsl
===================================================================
diff --git a/source/blender/draw/engines/gpencil/shaders/gpencil_layer_mask_frag.glsl b/source/blender/draw/engines/gpencil/shaders/gpencil_layer_mask_frag.glsl
index 8aebd80da9f..3889c42b04f 100644
--- a/source/blender/draw/engines/gpencil/shaders/gpencil_layer_mask_frag.glsl
+++ b/source/blender/draw/engines/gpencil/shaders/gpencil_layer_mask_frag.glsl
@@ -18,9 +18,8 @@ void main()
if (isFirstPass) {
/* Blend mode is multiply. */
- fragColor = vec4(1.0);
- fragRevealage.rgb = mix(vec3(1.0), masked_reveal, mask);
- fragRevealage.a = 1.0;
+ fragColor.rgb = fragRevealage.rgb = mix(vec3(1.0), masked_reveal, mask);
+ fragColor.a = fragRevealage.a = 1.0;
}
else {
/* Blend mode is additive. */
More information about the Bf-blender-cvs
mailing list