diff options
author | Antonio Vazquez <blendergit@gmail.com> | 2021-05-18 16:43:06 +0300 |
---|---|---|
committer | Antonio Vazquez <blendergit@gmail.com> | 2021-05-18 16:43:06 +0300 |
commit | 7aa7cc4ca14546722509dbe04cd0bcdca3df07b6 (patch) | |
tree | 6dc9d1c7e4336c1139012ff1597027c497ffafe2 /source/blender/draw | |
parent | 2b660e825b46131789d67a730773c8d56be4c229 (diff) | |
parent | a9da73ab95f07b7965df133edb6f32429ccb7302 (diff) |
Merge branch 'blender-v2.93-release'
Diffstat (limited to 'source/blender/draw')
-rw-r--r-- | source/blender/draw/engines/gpencil/gpencil_engine.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/draw/engines/gpencil/gpencil_engine.c b/source/blender/draw/engines/gpencil/gpencil_engine.c index 8bb336ebc96..32884eb9e3f 100644 --- a/source/blender/draw/engines/gpencil/gpencil_engine.c +++ b/source/blender/draw/engines/gpencil/gpencil_engine.c @@ -819,7 +819,10 @@ static void gpencil_draw_mask(GPENCIL_Data *vedata, GPENCIL_tObject *ob, GPENCIL } GPENCIL_tLayer *mask_layer = gpencil_layer_cache_get(ob, i); - BLI_assert(mask_layer); + /* When filtering by viewlayer, the mask could be null and must be ignored. */ + if (mask_layer == NULL) { + continue; + } DRW_draw_pass(mask_layer->geom_ps); } |