[Bf-blender-cvs] [a14da4a859f] greasepencil-object: Use Stroke Alpha when mix Normal Layers

[Antonioya]

Commit: a14da4a859f5961d2c766c3f59a32c40f3e9a991
Author: Antonioya
Date:   Mon Nov 26 16:17:58 2018 +0100
Branches: greasepencil-object
https://developer.blender.org/rBa14da4a859f5961d2c766c3f59a32c40f3e9a991

Use Stroke Alpha when mix Normal Layers

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

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 9e5634b7375..b15b0b29a43 100644
--- a/source/blender/draw/engines/gpencil/shaders/gpencil_blend_frag.glsl
+++ b/source/blender/draw/engines/gpencil/shaders/gpencil_blend_frag.glsl
@@ -97,7 +97,7 @@ void main()
 	if (mode == MODE_NORMAL) {
 		if (stroke_color.a > 0) {
 			if (mix_color.a > 0) {
-				FragColor = mix(stroke_color, mix_color, mix_color.a);
+				FragColor = vec4(mix(stroke_color.rgb, mix_color.rgb, mix_color.a), stroke_color.a);
 				gl_FragDepth = mix_depth;
 			}
 			else {