diff options
| author | Hans Goudey <h.goudey@me.com> | 2022-02-06 02:52:31 +0300 |
|---|---|---|
| committer | Hans Goudey <h.goudey@me.com> | 2022-02-06 02:52:31 +0300 |
| commit | 153f2c20b22ae2ee5741e9ec5b662c5d280fc558 (patch) | |
| tree | ae646337b1ce875c2938ed0248e49bc1c9a7fa93 /source/blender/draw | |
| parent | 94c0a59f959f6adfea48f8105b9aa25c3c5161bb (diff) | |
| parent | 59a8bdd48ce1eac7cf51249efacdf1a601afee32 (diff) | |
Merge branch 'blender-v3.1-release'
Diffstat (limited to 'source/blender/draw')
| -rw-r--r-- | source/blender/draw/engines/workbench/workbench_engine.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/draw/engines/workbench/workbench_engine.c b/source/blender/draw/engines/workbench/workbench_engine.c index 4a8c248a8e9..0dfc3c4b119 100644 --- a/source/blender/draw/engines/workbench/workbench_engine.c +++ b/source/blender/draw/engines/workbench/workbench_engine.c @@ -272,8 +272,8 @@ static eV3DShadingColorType workbench_color_type_get(WORKBENCH_PrivateData *wpd, { eV3DShadingColorType color_type = wpd->shading.color_type; const Mesh *me = (ob->type == OB_MESH) ? ob->data : NULL; - const CustomData *ldata = workbench_mesh_get_loop_custom_data(me); - const CustomData *vdata = workbench_mesh_get_vert_custom_data(me); + const CustomData *ldata = (me == NULL) ? NULL : workbench_mesh_get_loop_custom_data(me); + const CustomData *vdata = (me == NULL) ? NULL : workbench_mesh_get_vert_custom_data(me); const DRWContextState *draw_ctx = DRW_context_state_get(); const bool is_active = (ob == draw_ctx->obact); |