diff options
| author | Sybren A. Stüvel <sybren@blender.org> | 2020-01-28 20:24:17 +0300 |
|---|---|---|
| committer | Sybren A. Stüvel <sybren@blender.org> | 2020-01-28 20:24:17 +0300 |
| commit | 49403a676b81b0d6ca3d13c277af6de312153d3b (patch) | |
| tree | a38a7c88de53a6a323d6c8030b9caa9ecf9c5aa2 /source/blender/draw/engines/eevee | |
| parent | 1af8e0cc6c47b43bf9c94a3f845961f4d22cb34e (diff) | |
| parent | 12865caf4f3dd48f343db7167b20e303160004a3 (diff) | |
Merge remote-tracking branch 'origin/blender-v2.82-release'
Diffstat (limited to 'source/blender/draw/engines/eevee')
| -rw-r--r-- | source/blender/draw/engines/eevee/eevee_materials.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/draw/engines/eevee/eevee_materials.c b/source/blender/draw/engines/eevee/eevee_materials.c index 97d492d5dd5..2e0afc5d8d7 100644 --- a/source/blender/draw/engines/eevee/eevee_materials.c +++ b/source/blender/draw/engines/eevee/eevee_materials.c @@ -1457,7 +1457,7 @@ void EEVEE_materials_cache_populate(EEVEE_Data *vedata, /* First get materials for this mesh. */ if (ELEM(ob->type, OB_MESH, OB_CURVE, OB_SURF, OB_FONT, OB_MBALL)) { - const int materials_len = MAX2(1, ob->totcol); + const int materials_len = DRW_cache_object_material_count_get(ob); struct DRWShadingGroup **shgrp_array = BLI_array_alloca(shgrp_array, materials_len); struct DRWShadingGroup **shgrp_depth_array = BLI_array_alloca(shgrp_depth_array, |