diff options
author | Campbell Barton <ideasman42@gmail.com> | 2014-08-12 07:52:17 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-08-12 07:52:17 +0400 |
commit | ab06ec7a24821bd0ee968e72e28c0d9298c68b7d (patch) | |
tree | 23bf01869b1e84b1224a9ecde2e34da15f5bd85a /source/blender/blenkernel/BKE_cdderivedmesh.h | |
parent | 06020eb02e142fb58eedd6fc0a0ae0a17cb1bed5 (diff) |
Rewritten Array Modifier D443
Patch by PatB with own edits
- replace BMesh with CDDM functions.
- faster remove-vertex merging.
- extend CDDM_merge_verts to be more flexible.
Diffstat (limited to 'source/blender/blenkernel/BKE_cdderivedmesh.h')
-rw-r--r-- | source/blender/blenkernel/BKE_cdderivedmesh.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/source/blender/blenkernel/BKE_cdderivedmesh.h b/source/blender/blenkernel/BKE_cdderivedmesh.h index dffc2b665c2..b0ade7bacdf 100644 --- a/source/blender/blenkernel/BKE_cdderivedmesh.h +++ b/source/blender/blenkernel/BKE_cdderivedmesh.h @@ -58,7 +58,13 @@ struct DerivedMesh *CDDM_from_bmesh(struct BMesh *bm, const bool use_mdisps); DerivedMesh *CDDM_from_editbmesh(struct BMEditMesh *em, const bool use_mdisps, const bool use_tessface); /* merge verts */ -DerivedMesh *CDDM_merge_verts(DerivedMesh *dm, const int *vtargetmap, const int tot_vtargetmap); +/* Enum for merge_mode of CDDM_merge_verts. + * Refer to cdderivedmesh.c for details. */ +enum { + CDDM_MERGE_VERTS_DUMP_IF_MAPPED, + CDDM_MERGE_VERTS_DUMP_IF_EQUAL, +}; +DerivedMesh *CDDM_merge_verts(DerivedMesh *dm, const int *vtargetmap, const int tot_vtargetmap, const int merge_mode); /* creates a CDDerivedMesh from the given curve object */ struct DerivedMesh *CDDM_from_curve(struct Object *ob); |