diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-04-19 17:47:58 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-04-19 17:47:58 +0400 |
commit | 475ecbb0ce11d48ef41774ce1f982f992547beca (patch) | |
tree | 316c679f1c9e3d581078a2aa0a269caf304a8c2c /source/blender/blenkernel/intern | |
parent | 9276d7aeb2679a4eecbdd97f0ed699712920e4fb (diff) |
remove BM_ITER, BM_ITER_INDEX macros, use ELEM or MESH variants only (the maceros had unused args in both cases).
Diffstat (limited to 'source/blender/blenkernel/intern')
-rw-r--r-- | source/blender/blenkernel/intern/bvhutils.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/cdderivedmesh.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/customdata.c | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/editderivedmesh.c | 16 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/key.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/object.c | 2 |
6 files changed, 14 insertions, 14 deletions
diff --git a/source/blender/blenkernel/intern/bvhutils.c b/source/blender/blenkernel/intern/bvhutils.c index 5ccf47d5b73..009b7ca7f99 100644 --- a/source/blender/blenkernel/intern/bvhutils.c +++ b/source/blender/blenkernel/intern/bvhutils.c @@ -572,7 +572,7 @@ BVHTree* bvhtree_from_mesh_faces(BVHTreeFromMesh *data, DerivedMesh *mesh, float insert = 0; } else { - BM_ITER (v, &iter, em->bm, BM_VERTS_OF_FACE, f) { + BM_ITER_ELEM (v, &iter, f, BM_VERTS_OF_FACE) { if (BM_elem_flag_test(v, BM_ELEM_SELECT)) { /* Don't insert triangles tessellated from faces that have * any selected verts.*/ diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c index 232011c2d78..2d764142d26 100644 --- a/source/blender/blenkernel/intern/cdderivedmesh.c +++ b/source/blender/blenkernel/intern/cdderivedmesh.c @@ -1929,7 +1929,7 @@ DerivedMesh *CDDM_from_BMEditMesh(BMEditMesh *em, Mesh *UNUSED(me), int use_mdis mp->loopstart = j; mp->mat_nr = efa->mat_nr; - BM_ITER (l, &liter, bm, BM_LOOPS_OF_FACE, efa) { + BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) { mloop->v = BM_elem_index_get(l->v); mloop->e = BM_elem_index_get(l->e); CustomData_from_bmesh_block(&bm->ldata, &dm->loopData, l->head.data, j); diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c index b0c0294ca39..536d4d9c823 100644 --- a/source/blender/blenkernel/intern/customdata.c +++ b/source/blender/blenkernel/intern/customdata.c @@ -2204,8 +2204,8 @@ void CustomData_bmesh_merge(CustomData *source, CustomData *dest, BMIter liter; /*ensure all current elements follow new customdata layout*/ - BM_ITER (f, &iter, bm, BM_FACES_OF_MESH, NULL) { - BM_ITER (l, &liter, bm, BM_LOOPS_OF_FACE, f) { + BM_ITER_MESH (f, &iter, bm, BM_FACES_OF_MESH) { + BM_ITER_ELEM (l, &liter, f, BM_LOOPS_OF_FACE) { tmp = NULL; CustomData_bmesh_copy_data(&destold, dest, l->head.data, &tmp); CustomData_bmesh_free_block(&destold, &l->head.data); diff --git a/source/blender/blenkernel/intern/editderivedmesh.c b/source/blender/blenkernel/intern/editderivedmesh.c index d17de34a1d3..b6aebcddd4c 100644 --- a/source/blender/blenkernel/intern/editderivedmesh.c +++ b/source/blender/blenkernel/intern/editderivedmesh.c @@ -493,7 +493,7 @@ static void emDM_drawUVEdges(DerivedMesh *dm) BMIter iter; glBegin(GL_LINES); - BM_ITER (efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { BMIter liter; BMLoop *l; MLoopUV *lastluv = NULL, *firstluv = NULL; @@ -501,7 +501,7 @@ static void emDM_drawUVEdges(DerivedMesh *dm) if (BM_elem_flag_test(efa, BM_ELEM_HIDDEN)) continue; - BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { + BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) { MLoopUV *luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); if (luv) { @@ -1468,8 +1468,8 @@ static void emDM_copyLoopArray(DerivedMesh *dm, MLoop *loop_r) BM_mesh_elem_index_ensure(bm, BM_VERT | BM_EDGE); - BM_ITER (f, &iter, bm, BM_FACES_OF_MESH, NULL) { - BM_ITER (l, &liter, bm, BM_LOOPS_OF_FACE, f) { + BM_ITER_MESH (f, &iter, bm, BM_FACES_OF_MESH) { + BM_ITER_ELEM (l, &liter, f, BM_LOOPS_OF_FACE) { loop_r->v = BM_elem_index_get(l->v); loop_r->e = BM_elem_index_get(l->e); loop_r++; @@ -1486,7 +1486,7 @@ static void emDM_copyPolyArray(DerivedMesh *dm, MPoly *poly_r) int i; i = 0; - BM_ITER (f, &iter, bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (f, &iter, bm, BM_FACES_OF_MESH) { poly_r->flag = BM_face_flag_to_mflag(f); poly_r->loopstart = i; poly_r->totloop = f->len; @@ -1559,7 +1559,7 @@ static void emDM_getVertCos(DerivedMesh *dm, float (*cos_r)[3]) int i; i= 0; - BM_ITER (eve, &iter, emdm->tc->bm, BM_VERTS_OF_MESH, NULL) { + BM_ITER_MESH (eve, &iter, emdm->tc->bm, BM_VERTS_OF_MESH) { if (emdm->vertexCos) { copy_v3_v3(cos_r[i], emdm->vertexCos[i]); } @@ -1709,7 +1709,7 @@ DerivedMesh *getEditDerivedBMesh( bmdm->polyNos = MEM_mallocN(sizeof(*bmdm->polyNos)*bm->totface, "bmdm_pno"); i = 0; - BM_ITER (efa, &fiter, bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &fiter, bm, BM_FACES_OF_MESH) { BM_elem_index_set(efa, i); /* set_inline */ BM_face_normal_update_vcos(bm, efa, bmdm->polyNos[i], (float const (*)[3])vertexCos); i++; @@ -1719,7 +1719,7 @@ DerivedMesh *getEditDerivedBMesh( eve=BM_iter_new(&viter, bm, BM_VERTS_OF_MESH, NULL); for (i=0; eve; eve=BM_iter_step(&viter), i++) { float *no = bmdm->vertexNos[i]; - BM_ITER (efa, &fiter, bm, BM_FACES_OF_VERT, eve) { + BM_ITER_ELEM (efa, &fiter, eve, BM_FACES_OF_VERT) { add_v3_v3(no, bmdm->polyNos[BM_elem_index_get(efa)]); } diff --git a/source/blender/blenkernel/intern/key.c b/source/blender/blenkernel/intern/key.c index fc10a32c889..0a1c0467244 100644 --- a/source/blender/blenkernel/intern/key.c +++ b/source/blender/blenkernel/intern/key.c @@ -520,7 +520,7 @@ static char *key_block_get_data(Key *key, KeyBlock *actkb, KeyBlock *kb, char ** a = 0; co = MEM_callocN(sizeof(float) * 3 * me->edit_btmesh->bm->totvert, "key_block_get_data"); - BM_ITER (eve, &iter, me->edit_btmesh->bm, BM_VERTS_OF_MESH, NULL) { + BM_ITER_MESH (eve, &iter, me->edit_btmesh->bm, BM_VERTS_OF_MESH) { copy_v3_v3(co[a], eve->co); a++; } diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index f93592b769b..3271a623584 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -1770,7 +1770,7 @@ static void give_parvert(Object *par, int nr, float vec[3]) BMVert *eve; BMIter iter; - BM_ITER (eve, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { + BM_ITER_MESH (eve, &iter, em->bm, BM_VERTS_OF_MESH) { int *keyindex = CustomData_bmesh_get(&em->bm->vdata, eve->head.data, CD_SHAPE_KEYINDEX); if (keyindex && *keyindex==nr) { |