[Bf-blender-cvs] [381210db99b] temp-gpencil-fill: Merge branch 'master' into temp-fill-outside

[Antonio Vazquez]

Commit: 381210db99bf6febfb31ca4fd4ea062bdb1bbe99
Author: Antonio Vazquez
Date:   Sat Jan 16 16:12:52 2021 +0100
Branches: temp-gpencil-fill
https://developer.blender.org/rB381210db99bf6febfb31ca4fd4ea062bdb1bbe99

Merge branch 'master' into temp-fill-outside

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



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

diff --cc source/blender/editors/gpencil/gpencil_fill.c
index b8d70a84477,84447059884..232be02fa14
--- a/source/blender/editors/gpencil/gpencil_fill.c
+++ b/source/blender/editors/gpencil/gpencil_fill.c
@@@ -347,10 -268,48 +344,13 @@@ static void gpencil_draw_datablock(tGPD
        continue;
      }
  
+     /* calculate parent position */
+     BKE_gpencil_layer_transform_matrix_get(tgpw.depsgraph, ob, gpl, tgpw.diff_mat);
+ 
      /* 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) {
 -          skip = true;
 -        }
 -        break;
 -      }
 -      case GP_FILL_GPLMODE_ABOVE: {
 -        if (gpl_index != gpl_active_index + 1) {
 -          skip = true;
 -        }
 -        break;
 -      }
 -      case GP_FILL_GPLMODE_BELOW: {
 -        if (gpl_index != gpl_active_index - 1) {
 -          skip = true;
 -        }
 -        break;
 -      }
 -      case GP_FILL_GPLMODE_ALL_ABOVE: {
 -        if (gpl_index <= gpl_active_index) {
 -          skip = true;
 -        }
 -        break;
 -      }
 -      case GP_FILL_GPLMODE_ALL_BELOW: {
 -        if (gpl_index >= gpl_active_index) {
 -          skip = true;
 -        }
 -        break;
 -      }
 -      case GP_FILL_GPLMODE_VISIBLE:
 -      default:
 -        break;
 -    }
 +    bool skip = skip_layer_check(brush_settings->fill_layer_mode, gpl_active_index, gpl_index);
  
      /* if active layer and no keyframe, create a new one */
      if (gpl == tgpf->gpl) {