diff options
author | Campbell Barton <ideasman42@gmail.com> | 2020-05-08 11:57:20 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2020-05-08 11:57:20 +0300 |
commit | f10fb04162dd5929a1056f7ba08ba5ffa505b36a (patch) | |
tree | bc47ef94ccbd34229086ecc05c27dcc39d0f62be /source/blender | |
parent | a2f4d7b8a30234fbb4d278c8d3a8d8a8e4358114 (diff) | |
parent | 7a4e045d8f5f2d0e6e8db872aeb69d4c4b124f2a (diff) |
Merge branch 'blender-v2.83-release'
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/draw/engines/workbench/workbench_engine.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/source/blender/draw/engines/workbench/workbench_engine.c b/source/blender/draw/engines/workbench/workbench_engine.c index a372c7a5bc2..e75ba80608b 100644 --- a/source/blender/draw/engines/workbench/workbench_engine.c +++ b/source/blender/draw/engines/workbench/workbench_engine.c @@ -153,6 +153,9 @@ static void workbench_cache_texpaint_populate(WORKBENCH_PrivateData *wpd, Object if (geoms) { const int materials_len = DRW_cache_object_material_count_get(ob); for (int i = 0; i < materials_len; i++) { + if (geoms[i] == NULL) { + continue; + } DRWShadingGroup *grp = workbench_image_setup(wpd, ob, i + 1, NULL, NULL, 0); DRW_shgroup_call(grp, geoms[i], ob); } @@ -184,6 +187,9 @@ static void workbench_cache_common_populate(WORKBENCH_PrivateData *wpd, if (geoms) { const int materials_len = DRW_cache_object_material_count_get(ob); for (int i = 0; i < materials_len; i++) { + if (geoms[i] == NULL) { + continue; + } DRWShadingGroup *grp = workbench_material_setup(wpd, ob, i + 1, color_type, r_transp); DRW_shgroup_call(grp, geoms[i], ob); } |