[Bf-blender-cvs] [52390dc13ef] greasepencil-object: GPencil: Don't show NO_FILL strokes with Fill
Antonio Vazquez
noreply at git.blender.org
Fri Feb 28 19:09:42 CET 2020
Commit: 52390dc13efe6644bf30d89aecf07692cd4332cc
Author: Antonio Vazquez
Date: Fri Feb 28 19:09:28 2020 +0100
Branches: greasepencil-object
https://developer.blender.org/rB52390dc13efe6644bf30d89aecf07692cd4332cc
GPencil: Don't show NO_FILL strokes with Fill
These are special strokes to close Fill gaps.
===================================================================
M source/blender/draw/engines/gpencil/gpencil_engine.c
===================================================================
diff --git a/source/blender/draw/engines/gpencil/gpencil_engine.c b/source/blender/draw/engines/gpencil/gpencil_engine.c
index 8c618c1befb..5ea482cce03 100644
--- a/source/blender/draw/engines/gpencil/gpencil_engine.c
+++ b/source/blender/draw/engines/gpencil/gpencil_engine.c
@@ -477,7 +477,7 @@ static void gpencil_stroke_cache_populate(bGPDlayer *gpl,
bool hide_material = (gp_style->flag & GP_MATERIAL_HIDE) != 0;
bool show_stroke = (gp_style->flag & GP_MATERIAL_STROKE_SHOW) != 0;
bool show_fill = (gps->tot_triangles > 0) && ((gp_style->flag & GP_MATERIAL_FILL_SHOW) != 0) &&
- (!iter->pd->simplify_fill);
+ (!iter->pd->simplify_fill) && ((gps->flag & GP_STROKE_NOFILL) == 0);
bool only_lines = gpl && gpf && gpl->actframe != gpf && iter->pd->use_multiedit_lines_only;
More information about the Bf-blender-cvs
mailing list