griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix T77520: GPencil viewlayer filter produce crash with masking layers

Browse Source 
If a layer is used for masking, it cannot be filtered by viewlayer because the masked layer needs to have the mask layers in the draw pipeline.

This check is only done in final render.
This commit is contained in:
Antonio Vazquez
2020-06-07 13:06:03 +02:00
parent 8f25cfdbfd
commit dc6cee4724
1 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
source/blender/blenkernel/intern/gpencil.c
View File

@@ -1840,6 +1840,25 @@ bool BKE_gpencil_from_image(SpaceImage *sima, bGPDframe *gpf, const float size,
return done;
}
/**
* Helper to check if a layers is used as mask
* \param gpd Grease pencil datablock
* \param gpl_mask Actual Layer
* \return True if the layer is a mask
*/
static bool gpencil_is_layer_mask(bGPdata *gpd, bGPDlayer *gpl_mask)
{
LISTBASE_FOREACH (bGPDlayer *, gpl, &gpd->layers) {
LISTBASE_FOREACH (bGPDlayer_Mask *, mask, &gpl->mask_layers) {
if (STREQ(gpl_mask->info, mask->name)) {
return true;
}
}
}
return false;
}
/* -------------------------------------------------------------------- */
/** \name Iterators
*
@@ -1881,7 +1900,11 @@ void BKE_gpencil_visible_stroke_iter(ViewLayer *view_layer,
* This is used only in final render and never in Viewport. */
if ((view_layer != NULL) && (gpl->viewlayername[0] != '\0') &&
(!STREQ(view_layer->name, gpl->viewlayername))) {
continue;
/* If the layer is used as mask, cannot be filtered or the masking system
* will crash because needs the mask layer in the draw pipeline. */
if (!gpencil_is_layer_mask(gpd, gpl)) {
continue;
}
}
if (is_multiedit) {