[Bf-blender-cvs] [d19d0ff99e6] master: Fix T66376: Problem with Gpencil fill tool

Antonioya noreply at git.blender.org
Sun Jul 7 22:28:50 CEST 2019


Commit: d19d0ff99e61a49a7a0178bc58ff258bab775f70
Author: Antonioya
Date:   Sun Jul 7 22:28:41 2019 +0200
Branches: master
https://developer.blender.org/rBd19d0ff99e61a49a7a0178bc58ff258bab775f70

Fix T66376: Problem with Gpencil fill tool

The fill material has an alpha > 0, but the show fill is disabled, but as the fill tool is considered the fill as visible and the stroke is not drawn, the fill area had a gap.

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

M	source/blender/editors/gpencil/drawgpencil.c

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

diff --git a/source/blender/editors/gpencil/drawgpencil.c b/source/blender/editors/gpencil/drawgpencil.c
index 5f08035a56b..809acc3b322 100644
--- a/source/blender/editors/gpencil/drawgpencil.c
+++ b/source/blender/editors/gpencil/drawgpencil.c
@@ -888,7 +888,7 @@ static void gp_draw_strokes(tGPDdraw *tgpw)
 
     /* if disable fill, the colors with fill must be omitted too except fill boundary strokes */
     if ((tgpw->disable_fill == 1) && (gp_style->fill_rgba[3] > 0.0f) &&
-        ((gps->flag & GP_STROKE_NOFILL) == 0)) {
+        ((gps->flag & GP_STROKE_NOFILL) == 0) && (gp_style->flag & GP_STYLE_FILL_SHOW)) {
       continue;
     }



More information about the Bf-blender-cvs mailing list