diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-10-09 05:19:21 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-10-09 05:20:20 +0300 |
| commit | 75ac83610baeb296e530d82df8c9913a02f7acd8 (patch) | |
| tree | 8f2092ae83c18a5ffcbd9b1760475b33c5597872 /source/blender/blenkernel/intern/DerivedMesh.c | |
| parent | c8c3bbaadeeb469a83f8b3ae47599f28fa94ad30 (diff) | |
Modifier: add non derived mesh modifier wrappers
Rename modifier_deformVerts_ensure_normals &
modifier_applyModifier_ensure_normals with wrappers that match 2.7x
convention.
Diffstat (limited to 'source/blender/blenkernel/intern/DerivedMesh.c')
| -rw-r--r-- | source/blender/blenkernel/intern/DerivedMesh.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c index 605ffb41344..e4c2c935a33 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.c +++ b/source/blender/blenkernel/intern/DerivedMesh.c @@ -1560,7 +1560,7 @@ static void mesh_calc_modifiers( if (!deformedVerts) deformedVerts = BKE_mesh_vertexCos_get(me, &numVerts); - modifier_deformVerts_ensure_normals(md, &mectx_deform, NULL, deformedVerts, numVerts); + modwrap_deformVerts(md, &mectx_deform, NULL, deformedVerts, numVerts); } else { break; @@ -1700,7 +1700,7 @@ static void mesh_calc_modifiers( } } - modifier_deformVerts_ensure_normals(md, &mectx_deform, mesh, deformedVerts, numVerts); + modwrap_deformVerts(md, &mectx_deform, mesh, deformedVerts, numVerts); } else { /* determine which data layers are needed by following modifiers */ @@ -1767,7 +1767,7 @@ static void mesh_calc_modifiers( } } - Mesh *new_mesh = modifier_applyModifier_ensure_normals(md, &mectx_apply, mesh); + Mesh *new_mesh = modwrap_applyModifier(md, &mectx_apply, mesh); ASSERT_IS_VALID_MESH(new_mesh); if (new_mesh) { @@ -1798,7 +1798,7 @@ static void mesh_calc_modifiers( (mti->requiredDataMask ? mti->requiredDataMask(ob, md) : 0)); - new_mesh = modifier_applyModifier_ensure_normals(md, &mectx_orco, orco_mesh); + new_mesh = modwrap_applyModifier(md, &mectx_orco, orco_mesh); ASSERT_IS_VALID_MESH(new_mesh); if (new_mesh) { @@ -1821,7 +1821,7 @@ static void mesh_calc_modifiers( nextmask &= ~CD_MASK_CLOTH_ORCO; mesh_set_only_copy(cloth_orco_mesh, nextmask | CD_MASK_ORIGINDEX); - new_mesh = modifier_applyModifier_ensure_normals(md, &mectx_orco, cloth_orco_mesh); + new_mesh = modwrap_applyModifier(md, &mectx_orco, cloth_orco_mesh); ASSERT_IS_VALID_DM(new_mesh); if (new_mesh) { |