[Bf-blender-cvs] [a9da73ab95f] blender-v2.93-release: Fix T88370: GPencil render crash when use viewlayer and masking

[Antonio Vazquez]

Commit: a9da73ab95f07b7965df133edb6f32429ccb7302
Author: Antonio Vazquez
Date:   Tue May 18 15:42:26 2021 +0200
Branches: blender-v2.93-release
https://developer.blender.org/rBa9da73ab95f07b7965df133edb6f32429ccb7302

Fix T88370: GPencil render crash when use viewlayer and masking

When filtering the render using view layer, could be possible the mask is NULL and just need to be ignored.

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

M	source/blender/draw/engines/gpencil/gpencil_engine.c

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

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);
   }