diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2009-09-18 03:05:33 +0400 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2009-09-18 03:05:33 +0400 |
| commit | 0c65f27c796393e9aa8a3d5ba44c574e6ec878d4 (patch) | |
| tree | c74b1e46e10ad21c734e08fbe265a2a1264dba47 /source/blender/blenkernel/intern/modifiers_bmesh.c | |
| parent | b2c16fb401b0242bf840c9b080c134696c937dc3 (diff) | |
part 1 of cleaning up my little array macro library to be a formal API. also removed some extraneous selection calls from loopcut.c.
Diffstat (limited to 'source/blender/blenkernel/intern/modifiers_bmesh.c')
| -rw-r--r-- | source/blender/blenkernel/intern/modifiers_bmesh.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/source/blender/blenkernel/intern/modifiers_bmesh.c b/source/blender/blenkernel/intern/modifiers_bmesh.c index b502c21188f..84bbb1fb5d7 100644 --- a/source/blender/blenkernel/intern/modifiers_bmesh.c +++ b/source/blender/blenkernel/intern/modifiers_bmesh.c @@ -66,6 +66,7 @@ #include "DNA_texture_types.h" #include "BLI_editVert.h" +#include "BLI_array.h" #include "BKE_main.h" #include "BKE_anim.h" @@ -119,8 +120,8 @@ BMEditMesh *CDDM_To_BMesh(DerivedMesh *dm, BMEditMesh *existing) BMEdge *e, **etable, **edges=NULL; BMFace *f; BMIter liter; - V_DECLARE(verts); - V_DECLARE(edges); + BLI_array_declare(verts); + BLI_array_declare(edges); int numTex, numCol; int i, j, k, totvert, totedge, totface; @@ -180,13 +181,13 @@ BMEditMesh *CDDM_To_BMesh(DerivedMesh *dm, BMEditMesh *existing) for (; !dfiter->done; dfiter->step(dfiter)) { BMLoop *l; - V_RESET(verts); - V_RESET(edges); + BLI_array_empty(verts); + BLI_array_empty(edges); dliter = dfiter->getLoopsIter(dfiter); for (j=0; !dliter->done; dliter->step(dliter), j++) { - V_GROW(verts); - V_GROW(edges); + BLI_array_growone(verts); + BLI_array_growone(edges); verts[j] = vtable[dliter->vindex]; edges[j] = etable[dliter->eindex]; @@ -218,8 +219,8 @@ BMEditMesh *CDDM_To_BMesh(DerivedMesh *dm, BMEditMesh *existing) MEM_freeN(vtable); MEM_freeN(etable); - V_FREE(verts); - V_FREE(edges); + BLI_array_free(verts); + BLI_array_free(edges); if (!em) em = BMEdit_Create(bm); else BMEdit_RecalcTesselation(em); |