diff options
| author | Julian Eisel <julian@blender.org> | 2021-06-05 18:51:46 +0300 |
|---|---|---|
| committer | Julian Eisel <julian@blender.org> | 2021-06-05 18:51:46 +0300 |
| commit | 87a821397fa4db7b72ea809ee29c319cf4788a1a (patch) | |
| tree | 5b14c3657585b7e64ce1a3e14492925e0a79f473 /source/blender/draw/engines/gpencil/gpencil_cache_utils.c | |
| parent | d6e9b0ce5d61f64a3879459c9d39a151aabdea81 (diff) | |
| parent | edaaa2afddb2132e56f39791e559b084b6df8773 (diff) | |
Merge branch 'master' into asset-system-filelistasset-system-filelist
Diffstat (limited to 'source/blender/draw/engines/gpencil/gpencil_cache_utils.c')
| -rw-r--r-- | source/blender/draw/engines/gpencil/gpencil_cache_utils.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/source/blender/draw/engines/gpencil/gpencil_cache_utils.c b/source/blender/draw/engines/gpencil/gpencil_cache_utils.c index adb70f97585..af8b029a08e 100644 --- a/source/blender/draw/engines/gpencil/gpencil_cache_utils.c +++ b/source/blender/draw/engines/gpencil/gpencil_cache_utils.c @@ -274,7 +274,13 @@ GPENCIL_tLayer *gpencil_layer_cache_add(GPENCIL_PrivateData *pd, const bool override_vertcol = (pd->v3d_color_type != -1); const bool is_vert_col_mode = (pd->v3d_color_type == V3D_SHADING_VERTEX_COLOR) || GPENCIL_VERTEX_MODE(gpd) || pd->is_render; - bool is_masked = (gpl->flag & GP_LAYER_USE_MASK) && !BLI_listbase_is_empty(&gpl->mask_layers); + const bool is_viewlayer_render = pd->is_render && (gpl->viewlayername[0] != '\0') && + STREQ(pd->view_layer->name, gpl->viewlayername); + const bool disable_masks_render = is_viewlayer_render && + (gpl->flag & GP_LAYER_DISABLE_MASKS_IN_VIEWLAYER); + bool is_masked = disable_masks_render ? false : + (gpl->flag & GP_LAYER_USE_MASK) && + !BLI_listbase_is_empty(&gpl->mask_layers); float vert_col_opacity = (override_vertcol) ? (is_vert_col_mode ? pd->vertex_paint_opacity : 0.0f) : |