[Bf-blender-cvs] [27213905d60] draw-deferred-compilation-experiment: Sculpt: fix missing null pointer check in workbench_engine.c

[Joseph Eagar]

Commit: 27213905d60f5a553fec860885b19eabea94c89d
Author: Joseph Eagar
Date:   Thu Apr 21 00:58:19 2022 -0700
Branches: draw-deferred-compilation-experiment
https://developer.blender.org/rB27213905d60f5a553fec860885b19eabea94c89d

Sculpt: fix missing null pointer check
        in workbench_engine.c

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

M	source/blender/draw/engines/workbench/workbench_engine.c

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

diff --git a/source/blender/draw/engines/workbench/workbench_engine.c b/source/blender/draw/engines/workbench/workbench_engine.c
index 23543e6bfec..fb20bde2f65 100644
--- a/source/blender/draw/engines/workbench/workbench_engine.c
+++ b/source/blender/draw/engines/workbench/workbench_engine.c
@@ -271,13 +271,17 @@ static eV3DShadingColorType workbench_color_type_get(WORKBENCH_PrivateData *wpd,
     BKE_pbvh_is_drawing_set(ob->sculpt->pbvh, is_sculpt_pbvh);
   }
 
-  const CustomData *cd_vdata = workbench_mesh_get_vert_custom_data(me);
-  const CustomData *cd_ldata = workbench_mesh_get_loop_custom_data(me);
+  bool has_color = false;
 
-  bool has_color = (CustomData_has_layer(cd_vdata, CD_PROP_COLOR) ||
-                    CustomData_has_layer(cd_vdata, CD_PROP_BYTE_COLOR) ||
-                    CustomData_has_layer(cd_ldata, CD_PROP_COLOR) ||
-                    CustomData_has_layer(cd_ldata, CD_PROP_BYTE_COLOR));
+  if (me) {
+    const CustomData *cd_vdata = workbench_mesh_get_vert_custom_data(me);
+    const CustomData *cd_ldata = workbench_mesh_get_loop_custom_data(me);
+
+    has_color = (CustomData_has_layer(cd_vdata, CD_PROP_COLOR) ||
+                 CustomData_has_layer(cd_vdata, CD_PROP_BYTE_COLOR) ||
+                 CustomData_has_layer(cd_ldata, CD_PROP_COLOR) ||
+                 CustomData_has_layer(cd_ldata, CD_PROP_BYTE_COLOR));
+  }
 
   if (color_type == V3D_SHADING_TEXTURE_COLOR) {
     if (ob->dt < OB_TEXTURE) {