Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorAntonioya <blendergit@gmail.com>2019-05-30 14:21:21 +0300
committerAntonioya <blendergit@gmail.com>2019-05-30 14:23:26 +0300
commit2991713722465c7f0fdbf61214fb20a07fa964a7 (patch)
tree28b0bc3704e349942f3c8d046582b7f0a0d432a5 /source
parent0f8746e724f981c298e4a7c751759e75b0fe6d4c (diff)
GPencil: Add missing blend factor to Regular blend
Diffstat (limited to 'source')
-rw-r--r--source/blender/draw/engines/gpencil/shaders/gpencil_blend_frag.glsl2
1 files changed, 1 insertions, 1 deletions
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 {