[Bf-blender-cvs] [03d125b881b] greasepencil-object: Fix problems with Mask button

Antonioya noreply at git.blender.org
Sun Nov 25 18:15:06 CET 2018


Commit: 03d125b881bacf5c9522c3121c8e876a728bb06c
Author: Antonioya
Date:   Sun Nov 25 18:14:51 2018 +0100
Branches: greasepencil-object
https://developer.blender.org/rB03d125b881bacf5c9522c3121c8e876a728bb06c

Fix problems with Mask button

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

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 4ac34f9f8ab..dfd4418a1e3 100644
--- a/source/blender/draw/engines/gpencil/shaders/gpencil_blend_frag.glsl
+++ b/source/blender/draw/engines/gpencil/shaders/gpencil_blend_frag.glsl
@@ -81,9 +81,6 @@ void main()
 	ivec2 uv = ivec2(gl_FragCoord.xy);
 	vec4 stroke_color =  texelFetch(strokeColor, uv, 0).rgba;
 	float stroke_depth = texelFetch(strokeDepth, uv, 0).r;
-	if ((stroke_color.a == 0) && (disable_mask == ON)) {
-		discard;
-	}
 	
 	vec4 mix_color =  texelFetch(blendColor, uv, 0).rgba;
 	float mix_depth = texelFetch(blendDepth, uv, 0).r;



More information about the Bf-blender-cvs mailing list