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/BKE_modifier.h | |
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/BKE_modifier.h')
-rw-r--r-- | source/blender/blenkernel/BKE_modifier.h | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/source/blender/blenkernel/BKE_modifier.h b/source/blender/blenkernel/BKE_modifier.h index ee5a76302db..581b69619f2 100644 --- a/source/blender/blenkernel/BKE_modifier.h +++ b/source/blender/blenkernel/BKE_modifier.h @@ -427,20 +427,34 @@ const char *modifier_path_relbase_from_global(struct Object *ob); struct DerivedMesh *modwrap_applyModifier_DM_deprecated( ModifierData *md, const struct ModifierEvalContext *ctx, struct DerivedMesh *dm); +struct Mesh *modwrap_applyModifier( + ModifierData *md, const struct ModifierEvalContext *ctx, + struct Mesh *me); struct DerivedMesh *modwrap_applyModifierEM_DM_deprecated( ModifierData *md, const struct ModifierEvalContext *ctx, struct BMEditMesh *em, struct DerivedMesh *dm); +struct Mesh *modwrap_applyModifierEM( + ModifierData *md, const struct ModifierEvalContext *ctx, + struct BMEditMesh *em, struct Mesh *me); void modwrap_deformVerts_DM_deprecated( ModifierData *md, const struct ModifierEvalContext *ctx, struct DerivedMesh *dm, float (*vertexCos)[3], int numVerts); +void modwrap_deformVerts( + ModifierData *md, const struct ModifierEvalContext *ctx, + struct Mesh *me, + float (*vertexCos)[3], int numVerts); void modwrap_deformVertsEM_DM_deprecated( ModifierData *md, const struct ModifierEvalContext *ctx, struct BMEditMesh *em, struct DerivedMesh *dm, float (*vertexCos)[3], int numVerts); +void modwrap_deformVertsEM( + ModifierData *md, const struct ModifierEvalContext *ctx, + struct BMEditMesh *em, struct Mesh *me, + float (*vertexCos)[3], int numVerts); #define applyModifier_DM_wrapper(NEW_FUNC_NAME, OLD_FUNC_NAME) \ static Mesh *NEW_FUNC_NAME(ModifierData *md, const ModifierEvalContext *ctx, Mesh *mesh) \ @@ -456,16 +470,6 @@ void modwrap_deformVertsEM_DM_deprecated( * depending on if the modifier has been ported to Mesh or is still using DerivedMesh */ -void modifier_deformVerts_ensure_normals( - struct ModifierData *md, const struct ModifierEvalContext *ctx, - struct Mesh *mesh, float (*vertexCos)[3], int numVerts); - -struct Mesh *modifier_applyModifier_ensure_normals( - struct ModifierData *md, const struct ModifierEvalContext *ctx, - struct Mesh *mesh); - -/* deprecated variants of above that accept DerivedMesh */ - void modifier_deformVerts_DM_deprecated( struct ModifierData *md, const struct ModifierEvalContext *ctx, struct DerivedMesh *dm, float (*vertexCos)[3], int numVerts); |