[Bf-blender-cvs] [bc30fbd8327] greasepencil-object: Use stroke encaps only for solid mode
Antonio Vazquez
noreply at git.blender.org
Tue Feb 20 17:02:13 CET 2018
Commit: bc30fbd832783378ce0cb1e14b9f19b1a686b500
Author: Antonio Vazquez
Date: Mon Feb 19 19:08:45 2018 +0100
Branches: greasepencil-object
https://developer.blender.org/rBbc30fbd832783378ce0cb1e14b9f19b1a686b500
Use stroke encaps only for solid mode
If use endcaps in texture mode, sometimes the texture is not correct if the type of texture used is not defined in a way that can be doubled.
===================================================================
M source/blender/draw/engines/gpencil/shaders/gpencil_stroke_frag.glsl
===================================================================
diff --git a/source/blender/draw/engines/gpencil/shaders/gpencil_stroke_frag.glsl b/source/blender/draw/engines/gpencil/shaders/gpencil_stroke_frag.glsl
index fad10bebff1..78f48fe4e65 100644
--- a/source/blender/draw/engines/gpencil/shaders/gpencil_stroke_frag.glsl
+++ b/source/blender/draw/engines/gpencil/shaders/gpencil_stroke_frag.glsl
@@ -17,8 +17,8 @@ out vec4 fragColor;
void main()
{
vec4 tColor = vec4(mColor);
- /* if alpha < 0, then encap */
- if (mColor.a < 0) {
+ /* if alpha < 0, then encap (only solid mode ) */
+ if ((mColor.a < 0) && (color_type == GPENCIL_COLOR_SOLID)) {
vec2 center = vec2(uvfac, 1.0);
tColor.a = tColor.a * -1.0;
float dist = length(mTexCoord - center);
More information about the Bf-blender-cvs
mailing list