[Bf-blender-cvs] [29917137224] master: GPencil: Add missing blend factor to Regular blend

[Antonioya]

Commit: 2991713722465c7f0fdbf61214fb20a07fa964a7
Author: Antonioya
Date:   Thu May 30 13:21:21 2019 +0200
Branches: master
https://developer.blender.org/rB2991713722465c7f0fdbf61214fb20a07fa964a7

GPencil: Add missing blend factor to Regular blend

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

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 757acec03e1..7d6d9e98056 100644
--- a/source/blender/draw/engines/gpencil/shaders/gpencil_blend_frag.glsl
+++ b/source/blender/draw/engines/gpencil/shaders/gpencil_blend_frag.glsl
@@ -115,7 +115,7 @@ void main()
   if (mode == MODE_REGULAR) {
     if (stroke_color.a > 0) {
       if (mix_color.a > 0) {
-        FragColor = vec4(mix(stroke_color.rgb, mix_color.rgb, mix_color.a), stroke_color.a);
+        FragColor = vec4(mix(stroke_color.rgb, mix_color.rgb, mix_color.a * blend_opacity), stroke_color.a);
         gl_FragDepth = mix_depth;
       }
       else {