diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-02-12 19:02:33 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-02-12 19:02:33 +0400 |
| commit | 7c2715a7adaf902565519a94813c4f160206e3c7 (patch) | |
| tree | db2383b9be277a53a5e5a2b163a1a120c4de6777 /source/blender/blenkernel/intern/modifiers_bmesh.c | |
| parent | 2fcb6d058ea0c50f7f1c4d13e13708ddbacac71c (diff) | |
rename CDDM_To_BMesh to DM_to_editbmesh, since theres no requirement for
the input to be a CDDM.
remove conversions to CDDM for edge split and bevel (will give some
speedup).
Diffstat (limited to 'source/blender/blenkernel/intern/modifiers_bmesh.c')
| -rw-r--r-- | source/blender/blenkernel/intern/modifiers_bmesh.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/modifiers_bmesh.c b/source/blender/blenkernel/intern/modifiers_bmesh.c index 466b493098d..b3e0c298bbe 100644 --- a/source/blender/blenkernel/intern/modifiers_bmesh.c +++ b/source/blender/blenkernel/intern/modifiers_bmesh.c @@ -43,7 +43,7 @@ /* converts a cddm to a BMEditMesh. if existing is non-NULL, the * new geometry will be put in there.*/ -BMEditMesh *CDDM_To_BMesh(Object *ob, DerivedMesh *dm, BMEditMesh *existing, int do_tesselate) +BMEditMesh *DM_to_editbmesh(Object *ob, DerivedMesh *dm, BMEditMesh *existing, int do_tesselate) { int allocsize[4] = {512, 512, 2048, 512}; BMesh *bm, bmold; /*bmold is for storing old customdata layout*/ @@ -75,8 +75,8 @@ BMEditMesh *CDDM_To_BMesh(Object *ob, DerivedMesh *dm, BMEditMesh *existing, int totedge = dm->getNumEdges(dm); totface = dm->getNumPolys(dm); - vtable = MEM_callocN(sizeof(void**)*totvert, "vert table in BMDM_Copy"); - etable = MEM_callocN(sizeof(void**)*totedge, "edge table in BMDM_Copy"); + vtable = MEM_callocN(sizeof(void**) * totvert, "vert table in BMDM_Copy"); + etable = MEM_callocN(sizeof(void**) * totedge, "edge table in BMDM_Copy"); /*do verts*/ mv = mvert = dm->dupVertArray(dm); |