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/BKE_modifier.h | |
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/BKE_modifier.h')
-rw-r--r-- | source/blender/blenkernel/BKE_modifier.h | 48 |
1 files changed, 4 insertions, 44 deletions
diff --git a/source/blender/blenkernel/BKE_modifier.h b/source/blender/blenkernel/BKE_modifier.h index 71d693f8b75..ec18e652aec 100644 --- a/source/blender/blenkernel/BKE_modifier.h +++ b/source/blender/blenkernel/BKE_modifier.h @@ -164,32 +164,10 @@ typedef struct ModifierTypeInfo { /********************* Deform modifier functions *********************/ /* DEPRECATED */ - /* Only for deform types, should apply the deformation - * to the given vertex array. If the deformer requires information from - * the object it can obtain it from the derivedData argument if non-NULL, - * and otherwise the ob argument. - */ - void (*deformVerts_DM)(struct ModifierData *md, const struct ModifierEvalContext *ctx, - struct DerivedMesh *derivedData, - float (*vertexCos)[3], int numVerts); - - /* Like deformMatricesEM but called from object mode (for supporting modifiers in sculpt mode) */ - void (*deformMatrices_DM)(struct ModifierData *md, const struct ModifierEvalContext *ctx, - struct DerivedMesh *derivedData, - float (*vertexCos)[3], float (*defMats)[3][3], int numVerts); - - /* Like deformVerts but called during editmode (for supporting modifiers) - */ - void (*deformVertsEM_DM)(struct ModifierData *md, const struct ModifierEvalContext *ctx, - struct BMEditMesh *editData, - struct DerivedMesh *derivedData, - float (*vertexCos)[3], int numVerts); - - /* Set deform matrix per vertex for crazyspace correction */ - void (*deformMatricesEM_DM)(struct ModifierData *md, const struct ModifierEvalContext *ctx, - struct BMEditMesh *editData, - struct DerivedMesh *derivedData, - float (*vertexCos)[3], float (*defMats)[3][3], int numVerts); + void (*deformVerts_DM_removed)(void); + void (*deformMatrices_DM_removed)(void); + void (*deformVertsEM_DM_removed)(void); + void (*deformMatricesEM_DM_removed)(void); /********************* Non-deform modifier functions *********************/ /* DEPRECATED */ @@ -490,28 +468,10 @@ void modwrap_deformVertsEM( * depending on if the modifier has been ported to Mesh or is still using DerivedMesh */ -void modifier_deformVerts( - struct ModifierData *md, const struct ModifierEvalContext *ctx, - struct Mesh *mesh, float (*vertexCos)[3], int numVerts); - void modifier_deformVerts_ensure_normals( struct ModifierData *md, const struct ModifierEvalContext *ctx, struct Mesh *mesh, float (*vertexCos)[3], int numVerts); -void modifier_deformMatrices( - struct ModifierData *md, const struct ModifierEvalContext *ctx, - struct Mesh *mesh, float (*vertexCos)[3], float (*defMats)[3][3], int numVerts); - -void modifier_deformVertsEM( - struct ModifierData *md, const struct ModifierEvalContext *ctx, - struct BMEditMesh *editData, struct Mesh *mesh, - float (*vertexCos)[3], int numVerts); - -void modifier_deformMatricesEM( - struct ModifierData *md, const struct ModifierEvalContext *ctx, - struct BMEditMesh *editData, struct Mesh *mesh, - float (*vertexCos)[3], float (*defMats)[3][3], int numVerts); - struct Mesh *modifier_applyModifier( struct ModifierData *md, const struct ModifierEvalContext *ctx, struct Mesh *mesh); |