blender
/
blender
136
406
Fork 587
Code Issues 6.2k Pull Requests 755 Projects 19 Wiki Activity

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.
This commit is contained in:
Antonio Vazquez 2020-10-27 17:37:21 +01:00
parent 4975aa410c
commit bee5921e82
Notes: blender-bot 2023-02-14 08:08:56 +01:00 
Referenced by issue #82713, Snapping in the shader editor is linked with the 3d View.
Referenced by issue #82190, Nishita Sky's Sun Elevation and Sun Rotation change when rendering with F12
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
source/blender/editors/gpencil/gpencil_fill.c
View File

@ -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;