diff options
author | Clément Foucault <foucault.clem@gmail.com> | 2019-05-11 15:42:26 +0300 |
---|---|---|
committer | Clément Foucault <foucault.clem@gmail.com> | 2019-05-14 11:57:03 +0300 |
commit | ad0e95688d254abee315622ebdc3aeb0d2ba979d (patch) | |
tree | fe08a1fdd16b3bdd4e9e645b4a8f3e39a5856066 /source/blender/draw/engines/workbench/workbench_forward.c | |
parent | 2d28df783a029ee5b64da005b2fa400e4e8de976 (diff) |
Cleanup: DRW: Remove pointers to materials
Diffstat (limited to 'source/blender/draw/engines/workbench/workbench_forward.c')
-rw-r--r-- | source/blender/draw/engines/workbench/workbench_forward.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/source/blender/draw/engines/workbench/workbench_forward.c b/source/blender/draw/engines/workbench/workbench_forward.c index 13bd6fe9e4d..2011afb723a 100644 --- a/source/blender/draw/engines/workbench/workbench_forward.c +++ b/source/blender/draw/engines/workbench/workbench_forward.c @@ -623,18 +623,17 @@ void workbench_forward_cache_populate(WORKBENCH_Data *vedata, Object *ob) /* Draw material color */ if (is_sculpt_mode) { struct DRWShadingGroup **shgrps = BLI_array_alloca(shgrps, materials_len); - struct Material **mats = BLI_array_alloca(mats, materials_len); for (int i = 0; i < materials_len; ++i) { - mats[i] = give_current_material(ob, i + 1); + struct Material *mat = give_current_material(ob, i + 1); material = workbench_forward_get_or_create_material_data( - vedata, ob, mats[i], NULL, NULL, V3D_SHADING_MATERIAL_COLOR, 0, is_sculpt_mode); + vedata, ob, mat, NULL, NULL, V3D_SHADING_MATERIAL_COLOR, 0, is_sculpt_mode); shgrps[i] = material->shgrp; } /* TODO(fclem) make this call optional */ DRW_shgroup_call_sculpt_add(material->shgrp_object_outline, ob, false, false, false); if (!is_wire) { - DRW_shgroup_call_sculpt_with_materials_add(shgrps, mats, ob, false); + DRW_shgroup_call_sculpt_with_materials_add(shgrps, ob, false); } } else { |