Commit: 41dce8af6a425f6cf7cdcbf440ed51566e13a99b
Author: Campbell Barton
Date: Fri May 31 09:47:55 2019 +1000
Branches: master
https://developer.blender.org/rB41dce8af6a425f6cf7cdcbf440ed51566e13a99b
Cleanup: clang-format
===================================================================
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 7d6d9e98056..4a6025fcd24 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,8 @@ 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 *
blend_opacity), 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 {
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
