diff options
| author | Jacques Lucke <mail@jlucke.com> | 2018-09-19 17:59:05 +0300 |
|---|---|---|
| committer | Jacques Lucke <mail@jlucke.com> | 2018-09-19 18:33:03 +0300 |
| commit | 3614d9d2a218bb5c739832484b98989cdee3b3d3 (patch) | |
| tree | daebf52e7d02c4c5d41177edecc17c33769ddb1a /source/blender/blenkernel/intern/crazyspace.c | |
| parent | e81f7f25acb0687a3d037fa7e39420bc4a6d23a8 (diff) | |
Cleanup: Remove some DerivedMesh wrappers for modifiers
Specifically the deformVerts_DM, deformMatrices_DM, deformVertsEM_DM and deformMatricesEM_DM functions are not used anymore.
Reviewer: brecht
Diffstat (limited to 'source/blender/blenkernel/intern/crazyspace.c')
| -rw-r--r-- | source/blender/blenkernel/intern/crazyspace.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/crazyspace.c b/source/blender/blenkernel/intern/crazyspace.c index 2b4daae503d..539b4723121 100644 --- a/source/blender/blenkernel/intern/crazyspace.c +++ b/source/blender/blenkernel/intern/crazyspace.c @@ -277,7 +277,7 @@ int BKE_crazyspace_get_first_deform_matrices_editbmesh( if (!editbmesh_modifier_is_enabled(scene, md, dm)) continue; - if (mti->type == eModifierTypeType_OnlyDeform && (mti->deformMatricesEM || mti->deformMatricesEM_DM)) { + if (mti->type == eModifierTypeType_OnlyDeform && mti->deformMatricesEM) { if (!defmats) { const int required_mode = eModifierMode_Realtime | eModifierMode_Editmode; CustomDataMask data_mask = CD_MASK_BAREMESH; @@ -351,7 +351,7 @@ int BKE_sculpt_get_first_deform_matrices( unit_m3(defmats[a]); } - if (mti->deformMatrices || mti->deformMatrices_DM) { + if (mti->deformMatrices) { modifier_deformMatrices_DM_deprecated(md, &mectx, dm, deformedVerts, defmats, numVerts); } else break; @@ -401,10 +401,10 @@ void BKE_crazyspace_build_sculpt(struct Depsgraph *depsgraph, Scene *scene, Obje if (mti->type == eModifierTypeType_OnlyDeform) { /* skip leading modifiers which have been already * handled in sculpt_get_first_deform_matrices */ - if ((mti->deformMatrices || mti->deformMatrices_DM) && !deformed) + if (mti->deformMatrices && !deformed) continue; - modifier_deformVerts(md, &mectx, NULL, deformedVerts, me->totvert); + mti->deformVerts(md, &mectx, NULL, deformedVerts, me->totvert); deformed = 1; } } |