diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-06-19 12:00:20 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-06-19 12:00:20 +0400 |
commit | d9ec2efe8fc8d19628ebf425b8cc61c16f82bab1 (patch) | |
tree | d09ad3197e9d289477b205c733c7c19cc2f583e7 /source/blender/blenkernel/intern/DerivedMesh.c | |
parent | b3757069351ac5eab4e6c0e772f1cfbc83421c81 (diff) |
move modifier callback wrappers into modifier.c
Diffstat (limited to 'source/blender/blenkernel/intern/DerivedMesh.c')
-rw-r--r-- | source/blender/blenkernel/intern/DerivedMesh.c | 63 |
1 files changed, 0 insertions, 63 deletions
diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c index 6a21f33ac15..c9c33014aa5 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.c +++ b/source/blender/blenkernel/intern/DerivedMesh.c @@ -845,69 +845,6 @@ DerivedMesh *mesh_create_derived(Mesh *me, Object *ob, float (*vertCos)[3]) return dm; } -/***/ - -/* wrapper around ModifierTypeInfo.applyModifier that ensures valid normals */ - -static DerivedMesh *modwrap_applyModifier( - ModifierData *md, Object *ob, - DerivedMesh *dm, - ModifierApplyFlag flag) -{ - ModifierTypeInfo *mti = modifierType_getInfo(md->type); - BLI_assert(CustomData_has_layer(&dm->polyData, CD_NORMAL) == false); - - if (mti->dependsOnNormals && mti->dependsOnNormals(md)) { - DM_ensure_normals(dm); - } - return mti->applyModifier(md, ob, dm, flag); -} - -static DerivedMesh *modwrap_applyModifierEM( - ModifierData *md, Object *ob, - BMEditMesh *em, - DerivedMesh *dm, - ModifierApplyFlag flag) -{ - ModifierTypeInfo *mti = modifierType_getInfo(md->type); - BLI_assert(CustomData_has_layer(&dm->polyData, CD_NORMAL) == false); - - if (mti->dependsOnNormals && mti->dependsOnNormals(md)) { - DM_ensure_normals(dm); - } - return mti->applyModifierEM(md, ob, em, dm, flag); -} - -static void modwrap_deformVerts( - ModifierData *md, Object *ob, - DerivedMesh *dm, - float (*vertexCos)[3], int numVerts, - ModifierApplyFlag flag) -{ - ModifierTypeInfo *mti = modifierType_getInfo(md->type); - BLI_assert(!dm || CustomData_has_layer(&dm->polyData, CD_NORMAL) == false); - - if (dm && mti->dependsOnNormals && mti->dependsOnNormals(md)) { - DM_ensure_normals(dm); - } - mti->deformVerts(md, ob, dm, vertexCos, numVerts, flag); -} - -static void modwrap_deformVertsEM( - ModifierData *md, Object *ob, - BMEditMesh *em, DerivedMesh *dm, - float (*vertexCos)[3], int numVerts) -{ - ModifierTypeInfo *mti = modifierType_getInfo(md->type); - BLI_assert(!dm || CustomData_has_layer(&dm->polyData, CD_NORMAL) == false); - - if (dm && mti->dependsOnNormals && mti->dependsOnNormals(md)) { - DM_ensure_normals(dm); - } - mti->deformVertsEM(md, ob, em, dm, vertexCos, numVerts); -} -/* end modifier callback wrappers */ - DerivedMesh *mesh_create_derived_for_modifier(Scene *scene, Object *ob, ModifierData *md, int build_shapekey_layers) { |