From bee5921e82eb32dfc2c64aa063f991bc36faa5c7 Mon Sep 17 00:00:00 2001
From: Antonio Vazquez <blendergit@gmail.com>
Date: Tue, 27 Oct 2020 17:37:21 +0100
Subject: GPencil: Fix unreported Fill when use boundary and Visble layers

The new option to filter the layers used by the Fill tool was not using the boundary strokes. The problem was the layers were skipped and any boundary stroke was not used.

Now, the layer is not skipped, but the strokes that are not boundary are skipped.
---
 source/blender/editors/gpencil/gpencil_fill.c | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/source/blender/editors/gpencil/gpencil_fill.c b/source/blender/editors/gpencil/gpencil_fill.c
index a11397bd0bb..3c1f538cb99 100644
--- a/source/blender/editors/gpencil/gpencil_fill.c
+++ b/source/blender/editors/gpencil/gpencil_fill.c
@@ -269,36 +269,38 @@ static void gpencil_draw_datablock(tGPDfill *tgpf, const float ink[4])
       continue;
     }
 
-    /* Decide if layer is included or not depending of the layer mode. */
+    /* Decide if the strokes of layers are included or not depending on the layer mode.
+     * Cannot skip the layer because it can use boundary strokes and must be used. */
+    bool skip = false;
     const int gpl_index = BLI_findindex(&gpd->layers, gpl);
     switch (brush_settings->fill_layer_mode) {
       case GP_FILL_GPLMODE_ACTIVE: {
         if (gpl_index != gpl_active_index) {
-          continue;
+          skip = true;
         }
         break;
       }
       case GP_FILL_GPLMODE_ABOVE: {
         if (gpl_index != gpl_active_index + 1) {
-          continue;
+          skip = true;
         }
         break;
       }
       case GP_FILL_GPLMODE_BELOW: {
         if (gpl_index != gpl_active_index - 1) {
-          continue;
+          skip = true;
         }
         break;
       }
       case GP_FILL_GPLMODE_ALL_ABOVE: {
         if (gpl_index <= gpl_active_index) {
-          continue;
+          skip = true;
         }
         break;
       }
       case GP_FILL_GPLMODE_ALL_BELOW: {
         if (gpl_index >= gpl_active_index) {
-          continue;
+          skip = true;
         }
         break;
       }
@@ -338,6 +340,11 @@ static void gpencil_draw_datablock(tGPDfill *tgpf, const float ink[4])
         continue;
       }
 
+      /* If the layer must be skipped, but the stroke is not boundary, skip stroke. */
+      if ((skip) && ((gps->flag & GP_STROKE_NOFILL) == 0)) {
+        continue;
+      }
+
       tgpw.gps = gps;
       tgpw.gpl = gpl;
       tgpw.gpf = gpf;
-- 
cgit v1.2.3