[Bf-blender-cvs] [ebf5ff8afb9] master: GPencil: Display Fill Boundary strokes with stroke color

Antonio Vazquez noreply at git.blender.org
Thu Aug 13 20:18:34 CEST 2020


Commit: ebf5ff8afb9a1743cef46272acc570587607a2e9
Author: Antonio Vazquez
Date:   Thu Aug 13 20:14:23 2020 +0200
Branches: master
https://developer.blender.org/rBebf5ff8afb9a1743cef46272acc570587607a2e9

GPencil: Display Fill Boundary strokes with stroke color

This feature was removed during the refactor, but it's needed for this type of strokes to display the line using the stroke color without checking if the stroke is enabled or not in the material.

This color is used only for these special strokes.

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

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 746920e38c6..015e631dc14 100644
--- a/source/blender/draw/engines/gpencil/gpencil_engine.c
+++ b/source/blender/draw/engines/gpencil/gpencil_engine.c
@@ -488,7 +488,8 @@ static void gpencil_stroke_cache_populate(bGPDlayer *gpl,
   MaterialGPencilStyle *gp_style = BKE_gpencil_material_settings(iter->ob, gps->mat_nr + 1);
 
   bool hide_material = (gp_style->flag & GP_MATERIAL_HIDE) != 0;
-  bool show_stroke = (gp_style->flag & GP_MATERIAL_STROKE_SHOW) != 0;
+  bool show_stroke = ((gp_style->flag & GP_MATERIAL_STROKE_SHOW) != 0) ||
+                     ((gps->flag & GP_STROKE_NOFILL) != 0);
   bool show_fill = (gps->tot_triangles > 0) && ((gp_style->flag & GP_MATERIAL_FILL_SHOW) != 0) &&
                    (!iter->pd->simplify_fill) && ((gps->flag & GP_STROKE_NOFILL) == 0);



More information about the Bf-blender-cvs mailing list