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/editors | |
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/editors')
31 files changed, 394 insertions, 394 deletions
diff --git a/source/blender/editors/mesh/editface.c b/source/blender/editors/mesh/editface.c index f1d0d63ba03..f38bdb1ebe3 100644 --- a/source/blender/editors/mesh/editface.c +++ b/source/blender/editors/mesh/editface.c @@ -814,7 +814,7 @@ void ED_mesh_mirrtopo_init(Mesh *me, const int ob_mode, MirrTopoStore_t *mesh_to if (em) { totedge = me->edit_btmesh->bm->totedge; - BM_ITER (eed, &iter, em->bm, BM_EDGES_OF_MESH, NULL) { + BM_ITER_MESH (eed, &iter, em->bm, BM_EDGES_OF_MESH) { topo_hash[BM_elem_index_get(eed->v1)]++; topo_hash[BM_elem_index_get(eed->v2)]++; } @@ -835,7 +835,7 @@ void ED_mesh_mirrtopo_init(Mesh *me, const int ob_mode, MirrTopoStore_t *mesh_to /* use the number of edges per vert to give verts unique topology IDs */ if (em) { - BM_ITER (eed, &iter, em->bm, BM_EDGES_OF_MESH, NULL) { + BM_ITER_MESH (eed, &iter, em->bm, BM_EDGES_OF_MESH) { topo_hash[BM_elem_index_get(eed->v1)] += topo_hash_prev[BM_elem_index_get(eed->v2)]; topo_hash[BM_elem_index_get(eed->v2)] += topo_hash_prev[BM_elem_index_get(eed->v1)]; } diff --git a/source/blender/editors/mesh/editmesh_bvh.c b/source/blender/editors/mesh/editmesh_bvh.c index 9f5ab8a20d8..8be0cc0aa36 100644 --- a/source/blender/editors/mesh/editmesh_bvh.c +++ b/source/blender/editors/mesh/editmesh_bvh.c @@ -125,7 +125,7 @@ BMBVHTree *BMBVH_NewBVH(BMEditMesh *em, int flag, Scene *scene, Object *obedit) void *data[3]; tree->cos = MEM_callocN(sizeof(float) * 3 * em->bm->totvert, "bmbvh cos"); - BM_ITER_INDEX (v, &iter, em->bm, BM_VERTS_OF_MESH, NULL, i) { + BM_ITER_MESH_INDEX (v, &iter, em->bm, BM_VERTS_OF_MESH, i) { BM_elem_index_set(v, i); /* set_inline */ copy_v3_v3(tree->cos[i], v->co); } diff --git a/source/blender/editors/mesh/editmesh_knife.c b/source/blender/editors/mesh/editmesh_knife.c index 9d0285e9ceb..29006a78a29 100644 --- a/source/blender/editors/mesh/editmesh_knife.c +++ b/source/blender/editors/mesh/editmesh_knife.c @@ -557,7 +557,7 @@ static void knife_get_vert_faces(knifetool_opdata *kcd, KnifeVert *kfv, BMFace * } else if (kfv->v) { BMesh *bm = kcd->em->bm; - BM_ITER (f, &bmiter, bm, BM_FACES_OF_VERT, kfv->v) { + BM_ITER_ELEM (f, &bmiter, kfv->v, BM_FACES_OF_VERT) { knife_append_list(kcd, lst, f); } } @@ -570,7 +570,7 @@ static void knife_get_edge_faces(knifetool_opdata *kcd, KnifeEdge *kfe, ListBase if (kfe->e) { BMesh *bm = kcd->em->bm; - BM_ITER (f, &bmiter, bm, BM_FACES_OF_EDGE, kfe->e) { + BM_ITER_ELEM (f, &bmiter, kfe->e, BM_FACES_OF_EDGE) { knife_append_list(kcd, lst, f); } } @@ -1706,7 +1706,7 @@ static void remerge_faces(knifetool_opdata *kcd) BMO_op_finish(bm, &bmop); BLI_smallhash_init(visit); - BM_ITER (f, &iter, bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (f, &iter, bm, BM_FACES_OF_MESH) { BMIter eiter; BMEdge *e; BMFace *f2; @@ -1727,14 +1727,14 @@ static void remerge_faces(knifetool_opdata *kcd) BLI_array_append(faces, f2); - BM_ITER (e, &eiter, bm, BM_EDGES_OF_FACE, f2) { + BM_ITER_ELEM (e, &eiter, f2, BM_EDGES_OF_FACE) { BMIter fiter; BMFace *f3; if (BMO_elem_flag_test(bm, e, BOUNDARY)) continue; - BM_ITER (f3, &fiter, bm, BM_FACES_OF_EDGE, e) { + BM_ITER_ELEM (f3, &fiter, e, BM_FACES_OF_EDGE) { if (!BMO_elem_flag_test(bm, f3, FACE_NEW)) continue; if (BLI_smallhash_haskey(visit, (intptr_t)f3)) @@ -1789,14 +1789,14 @@ static void knifenet_fill_faces(knifetool_opdata *kcd) /* BMESH_TODO this should be valid now, leaving here until we can ensure this - campbell */ i = 0; - BM_ITER (f, &bmiter, bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (f, &bmiter, bm, BM_FACES_OF_MESH) { BM_elem_index_set(f, i); /* set_inline */ faces[i] = f; i++; } bm->elem_index_dirty &= ~BM_FACE; - BM_ITER (e, &bmiter, bm, BM_EDGES_OF_MESH, NULL) { + BM_ITER_MESH (e, &bmiter, bm, BM_EDGES_OF_MESH) { BMO_elem_flag_enable(bm, e, BOUNDARY); } @@ -1984,7 +1984,7 @@ static void knifenet_fill_faces(knifetool_opdata *kcd) bm->elem_index_dirty |= BM_FACE; /* interpolate customdata */ - BM_ITER (f, &bmiter, bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (f, &bmiter, bm, BM_FACES_OF_MESH) { BMLoop *l1; BMFace *f2; BMIter liter1; @@ -1999,7 +1999,7 @@ static void knifenet_fill_faces(knifetool_opdata *kcd) BM_elem_attrs_copy(bm, bm, f2, f); - BM_ITER (l1, &liter1, bm, BM_LOOPS_OF_FACE, f) { + BM_ITER_ELEM (l1, &liter1, f, BM_LOOPS_OF_FACE) { BM_loop_interp_from_face(bm, l1, f2, TRUE, TRUE); } } @@ -2306,7 +2306,7 @@ static int find_hole_chains(knifetool_opdata *kcd, ListBase *hole, BMFace *f, Li } j = 0; - BM_ITER (v, &iter, kcd->em->bm, BM_VERTS_OF_FACE, f) { + BM_ITER_ELEM (v, &iter, f, BM_VERTS_OF_FACE) { fco[j] = BLI_memarena_alloc(kcd->arena, 2 * sizeof(float)); fco[j][0] = v->co[ax]; fco[j][1] = v->co[ay]; @@ -2413,7 +2413,7 @@ static int knife_edge_in_face(knifetool_opdata *kcd, KnifeEdge *kfe, BMFace *f) l2 = NULL; /* find out if v1 and v2, if set, are part of the face */ - BM_ITER (l, &iter, bm, BM_LOOPS_OF_FACE, f) { + BM_ITER_ELEM (l, &iter, f, BM_LOOPS_OF_FACE) { if (v1 && l->v == v1) l1 = l; if (v2 && l->v == v2) diff --git a/source/blender/editors/mesh/editmesh_loopcut.c b/source/blender/editors/mesh/editmesh_loopcut.c index a41059ef3ca..27e3e643be1 100644 --- a/source/blender/editors/mesh/editmesh_loopcut.c +++ b/source/blender/editors/mesh/editmesh_loopcut.c @@ -145,7 +145,7 @@ static void edgering_find_order(BMEditMesh *em, BMEdge *lasteed, BMEdge *eed, /* find correct order for v[1] */ if (!(BM_edge_in_face(l->f, eed) && BM_edge_in_face(l->f, lasteed))) { - BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_LOOP, l) { + BM_ITER_ELEM (l, &liter, l, BM_LOOPS_OF_LOOP) { if (BM_edge_in_face(l->f, eed) && BM_edge_in_face(l->f, lasteed)) break; } diff --git a/source/blender/editors/mesh/editmesh_rip.c b/source/blender/editors/mesh/editmesh_rip.c index 7904c6f8c36..9ae816903f2 100644 --- a/source/blender/editors/mesh/editmesh_rip.c +++ b/source/blender/editors/mesh/editmesh_rip.c @@ -158,7 +158,7 @@ static BMEdge *edbm_ripsel_edge_mark_step(BMesh *bm, BMVert *v, const int uid) { BMIter iter; BMEdge *e; - BM_ITER (e, &iter, bm, BM_EDGES_OF_VERT, v) { + BM_ITER_ELEM (e, &iter, v, BM_EDGES_OF_VERT) { if (IS_VISIT_POSSIBLE(e) && !IS_VISIT_DONE(e)) { BMLoop *l_a, *l_b; @@ -196,8 +196,8 @@ static EdgeLoopPair *edbm_ripsel_looptag_helper(BMesh *bm) EdgeLoopPair *lp; /* initialize loops with dummy invalid index values */ - BM_ITER (f, &fiter, bm, BM_FACES_OF_MESH, NULL) { - BM_ITER (l, &liter, bm, BM_LOOPS_OF_FACE, f) { + BM_ITER_MESH (f, &fiter, bm, BM_FACES_OF_MESH) { + BM_ITER_ELEM (l, &liter, f, BM_LOOPS_OF_FACE) { BM_elem_index_set(l, INVALID_UID); } } @@ -213,7 +213,7 @@ static EdgeLoopPair *edbm_ripsel_looptag_helper(BMesh *bm) BMEdge *e_last; e_first = NULL; - BM_ITER (e, &eiter, bm, BM_EDGES_OF_MESH, NULL) { + BM_ITER_MESH (e, &eiter, bm, BM_EDGES_OF_MESH) { if (IS_VISIT_POSSIBLE(e) && !IS_VISIT_DONE(e)) { e_first = e; break; @@ -290,7 +290,7 @@ static BMEdge *edbm_ripsel_edge_uid_step(BMesh *bm, BMEdge *e_orig, BMVert **v_p BMVert *v = BM_edge_other_vert(e_orig, *v_prev); const int uid_cmp = BM_elem_index_get(e_orig->l) - 1; - BM_ITER (e, &eiter, bm, BM_EDGES_OF_VERT, v) { + BM_ITER_ELEM (e, &eiter, v, BM_EDGES_OF_VERT) { if (BM_elem_index_get(e->l) == uid_cmp) { *v_prev = v; return e; @@ -374,7 +374,7 @@ static int edbm_rip_invoke(bContext *C, wmOperator *op, wmEvent *event) ED_view3d_ob_project_mat_get(rv3d, obedit, projectMat); /* BM_ELEM_SELECT --> BM_ELEM_TAG */ - BM_ITER (e, &iter, em->bm, BM_EDGES_OF_MESH, NULL) { + BM_ITER_MESH (e, &iter, em->bm, BM_EDGES_OF_MESH) { BM_elem_flag_set(e, BM_ELEM_TAG, BM_elem_flag_test(e, BM_ELEM_SELECT)); } @@ -393,7 +393,7 @@ static int edbm_rip_invoke(bContext *C, wmOperator *op, wmEvent *event) else { ese.ele = NULL; - BM_ITER (v, &iter, bm, BM_VERTS_OF_MESH, NULL) { + BM_ITER_MESH (v, &iter, bm, BM_VERTS_OF_MESH) { if (BM_elem_flag_test(v, BM_ELEM_SELECT)) break; } @@ -407,7 +407,7 @@ static int edbm_rip_invoke(bContext *C, wmOperator *op, wmEvent *event) if (v->e) { /* find closest edge to mouse cursor */ - BM_ITER (e, &iter, bm, BM_EDGES_OF_VERT, v) { + BM_ITER_ELEM (e, &iter, v, BM_EDGES_OF_VERT) { int is_boundary = BM_edge_is_boundary(e); /* consider wire as boundary for this purpose, * otherwise we can't a face away from a wire edge */ @@ -455,7 +455,7 @@ static int edbm_rip_invoke(bContext *C, wmOperator *op, wmEvent *event) dist = FLT_MAX; for (i = 0; i < vout_len; i++) { - BM_ITER (l, &iter, bm, BM_LOOPS_OF_VERT, vout[i]) { + BM_ITER_ELEM (l, &iter, vout[i], BM_LOOPS_OF_VERT) { if (!BM_elem_flag_test(l->f, BM_ELEM_HIDDEN)) { float l_mid_co[3]; BM_loop_face_tangent(l, l_mid_co); @@ -534,10 +534,10 @@ static int edbm_rip_invoke(bContext *C, wmOperator *op, wmEvent *event) } else { /* expand edge selection */ - BM_ITER (v, &iter, bm, BM_VERTS_OF_MESH, NULL) { + BM_ITER_MESH (v, &iter, bm, BM_VERTS_OF_MESH) { e2 = NULL; i = 0; - BM_ITER (e, &eiter, bm, BM_EDGES_OF_VERT, v) { + BM_ITER_ELEM (e, &eiter, v, BM_EDGES_OF_VERT) { /* important to check selection rather then tag here * else we get feedback loop */ if (BM_elem_flag_test(e, BM_ELEM_SELECT)) { @@ -604,12 +604,12 @@ static int edbm_rip_invoke(bContext *C, wmOperator *op, wmEvent *event) #else dist = FLT_MAX; - BM_ITER (v, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { + BM_ITER_MESH (v, &iter, em->bm, BM_VERTS_OF_MESH) { if (BM_elem_flag_test(v, BM_ELEM_SELECT)) { /* disable by default, re-enable winner at end */ BM_elem_select_set(bm, v, FALSE); - BM_ITER (l, &liter, bm, BM_LOOPS_OF_VERT, v) { + BM_ITER_ELEM (l, &liter, v, BM_LOOPS_OF_VERT) { /* calculate a point in the face, rather then calculate the middle, * make a vector pointing between the 2 edges attached to this loop */ sub_v3_v3v3(l_prev_co, l->prev->v->co, l->v->co); diff --git a/source/blender/editors/mesh/editmesh_select.c b/source/blender/editors/mesh/editmesh_select.c index 831813c566f..52547c120c0 100644 --- a/source/blender/editors/mesh/editmesh_select.c +++ b/source/blender/editors/mesh/editmesh_select.c @@ -75,7 +75,7 @@ void EDBM_select_mirrored(Object *UNUSED(obedit), BMEditMesh *em, int extend) BMVert *v1, *v2; BMIter iter; - BM_ITER (v1, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { + BM_ITER_MESH (v1, &iter, em->bm, BM_VERTS_OF_MESH) { if (!BM_elem_flag_test(v1, BM_ELEM_SELECT) || BM_elem_flag_test(v1, BM_ELEM_HIDDEN)) { BM_elem_flag_disable(v1, BM_ELEM_TAG); } @@ -89,7 +89,7 @@ void EDBM_select_mirrored(Object *UNUSED(obedit), BMEditMesh *em, int extend) if (!extend) EDBM_flag_disable_all(em, BM_ELEM_SELECT); - BM_ITER (v1, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { + BM_ITER_MESH (v1, &iter, em->bm, BM_VERTS_OF_MESH) { if (!BM_elem_flag_test(v1, BM_ELEM_TAG) || BM_elem_flag_test(v1, BM_ELEM_HIDDEN)) continue; @@ -1221,7 +1221,7 @@ static int edgetag_shortest_path(Scene *scene, BMEditMesh *em, BMEdge *source, B /* note, would pass BM_EDGE except we are looping over all edges anyway */ BM_mesh_elem_index_ensure(em->bm, BM_VERT /* | BM_EDGE */); - BM_ITER (e, &iter, em->bm, BM_EDGES_OF_MESH, NULL) { + BM_ITER_MESH (e, &iter, em->bm, BM_EDGES_OF_MESH) { if (BM_elem_flag_test(e, BM_ELEM_HIDDEN)) { BLI_smallhash_insert(&visithash, (uintptr_t)e, NULL); } @@ -1239,7 +1239,7 @@ static int edgetag_shortest_path(Scene *scene, BMEditMesh *em, BMEdge *source, B cost = MEM_mallocN(sizeof(*cost) * totedge, "SeamPathCost"); /* count edges, compute adjacent edges offsets and fill adjacent */ - BM_ITER (e, &iter, em->bm, BM_EDGES_OF_MESH, NULL) { + BM_ITER_MESH (e, &iter, em->bm, BM_EDGES_OF_MESH) { nedges[BM_elem_index_get(e->v1) + 1]++; nedges[BM_elem_index_get(e->v2) + 1]++; } @@ -1252,7 +1252,7 @@ static int edgetag_shortest_path(Scene *scene, BMEditMesh *em, BMEdge *source, B nedges[0] = nedges[1] = 0; i = 0; - BM_ITER (e, &iter, em->bm, BM_EDGES_OF_MESH, NULL) { + BM_ITER_MESH (e, &iter, em->bm, BM_EDGES_OF_MESH) { edges[nedges[BM_elem_index_get(e->v1) + 1]++] = i; edges[nedges[BM_elem_index_get(e->v2) + 1]++] = i; @@ -1643,7 +1643,7 @@ void EDBM_deselect_by_material(BMEditMesh *em, const short index, const short se BMIter iter; BMFace *efa; - BM_ITER (efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { if (BM_elem_flag_test(efa, BM_ELEM_HIDDEN)) continue; if (efa->mat_nr == index) { @@ -1668,21 +1668,21 @@ void EDBM_select_swap(BMEditMesh *em) /* exported for UV */ BMFace *efa; if (em->bm->selectmode & SCE_SELECT_VERTEX) { - BM_ITER (eve, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { + BM_ITER_MESH (eve, &iter, em->bm, BM_VERTS_OF_MESH) { if (BM_elem_flag_test(eve, BM_ELEM_HIDDEN)) continue; BM_elem_select_set(em->bm, eve, !BM_elem_flag_test(eve, BM_ELEM_SELECT)); } } else if (em->selectmode & SCE_SELECT_EDGE) { - BM_ITER (eed, &iter, em->bm, BM_EDGES_OF_MESH, NULL) { + BM_ITER_MESH (eed, &iter, em->bm, BM_EDGES_OF_MESH) { if (BM_elem_flag_test(eed, BM_ELEM_HIDDEN)) continue; BM_elem_select_set(em->bm, eed, !BM_elem_flag_test(eed, BM_ELEM_SELECT)); } } else { - BM_ITER (efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { if (BM_elem_flag_test(efa, BM_ELEM_HIDDEN)) continue; BM_elem_select_set(em->bm, efa, !BM_elem_flag_test(efa, BM_ELEM_SELECT)); @@ -1702,13 +1702,13 @@ int EDBM_select_interior_faces(BMEditMesh *em) int ok; int change = FALSE; - BM_ITER (efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { if (BM_elem_flag_test(efa, BM_ELEM_HIDDEN)) continue; ok = TRUE; - BM_ITER (eed, &eiter, bm, BM_EDGES_OF_FACE, efa) { + BM_ITER_ELEM (eed, &eiter, efa, BM_EDGES_OF_FACE) { if (BM_edge_face_count(eed) < 3) { ok = FALSE; break; @@ -1785,7 +1785,7 @@ static int edbm_select_linked_pick_invoke(bContext *C, wmOperator *op, wmEvent * if (limit) { /* hflag no-seam --> bmo-tag */ - BM_ITER (e, &iter, bm, BM_EDGES_OF_MESH, NULL) { + BM_ITER_MESH (e, &iter, bm, BM_EDGES_OF_MESH) { /* BMESH_TODO, don't use 'BM_ELEM_SELECT' here, its a HFLAG only! */ BMO_elem_flag_set(bm, e, BM_ELEM_SELECT, !BM_elem_flag_test(e, BM_ELEM_SEAM)); } @@ -1870,13 +1870,13 @@ static int edbm_select_linked_exec(bContext *C, wmOperator *op) if (em->selectmode == SCE_SELECT_FACE) { BMFace *efa; - BM_ITER (efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { BM_elem_flag_set(efa, BM_ELEM_TAG, (BM_elem_flag_test(efa, BM_ELEM_SELECT) && !BM_elem_flag_test(efa, BM_ELEM_HIDDEN))); } if (limit) { - BM_ITER (e, &iter, bm, BM_EDGES_OF_MESH, NULL) { + BM_ITER_MESH (e, &iter, bm, BM_EDGES_OF_MESH) { /* BMESH_TODO, don't use 'BM_ELEM_SELECT' here, its a HFLAG only! */ BMO_elem_flag_set(bm, e, BM_ELEM_SELECT, !BM_elem_flag_test(e, BM_ELEM_SEAM)); } @@ -1887,7 +1887,7 @@ static int edbm_select_linked_exec(bContext *C, wmOperator *op) BMW_FLAG_TEST_HIDDEN, BMW_NIL_LAY); - BM_ITER (efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { if (BM_elem_flag_test(efa, BM_ELEM_TAG)) { e = BMW_begin(&walker, efa); for (; efa; efa = BMW_step(&walker)) { @@ -1898,7 +1898,7 @@ static int edbm_select_linked_exec(bContext *C, wmOperator *op) BMW_end(&walker); } else { - BM_ITER (v, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { + BM_ITER_MESH (v, &iter, em->bm, BM_VERTS_OF_MESH) { if (BM_elem_flag_test(v, BM_ELEM_SELECT)) { BM_elem_flag_enable(v, BM_ELEM_TAG); } @@ -1912,7 +1912,7 @@ static int edbm_select_linked_exec(bContext *C, wmOperator *op) BMW_FLAG_TEST_HIDDEN, BMW_NIL_LAY); - BM_ITER (v, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { + BM_ITER_MESH (v, &iter, em->bm, BM_VERTS_OF_MESH) { if (BM_elem_flag_test(v, BM_ELEM_TAG)) { e = BMW_begin(&walker, v); for (; e; e = BMW_step(&walker)) { @@ -2102,7 +2102,7 @@ static void deselect_nth_active(BMEditMesh *em, BMVert **r_eve, BMEdge **r_eed, } if (em->selectmode & SCE_SELECT_VERTEX) { - BM_ITER (v, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { + BM_ITER_MESH (v, &iter, em->bm, BM_VERTS_OF_MESH) { if (BM_elem_flag_test(v, BM_ELEM_SELECT)) { *r_eve = v; return; @@ -2110,7 +2110,7 @@ static void deselect_nth_active(BMEditMesh *em, BMVert **r_eve, BMEdge **r_eed, } } else if (em->selectmode & SCE_SELECT_EDGE) { - BM_ITER (e, &iter, em->bm, BM_EDGES_OF_MESH, NULL) { + BM_ITER_MESH (e, &iter, em->bm, BM_EDGES_OF_MESH) { if (BM_elem_flag_test(e, BM_ELEM_SELECT)) { *r_eed = e; return; @@ -2223,7 +2223,7 @@ static int edbm_select_sharp_edges_exec(bContext *C, wmOperator *op) sharp = DEG2RADF(sharp); - BM_ITER (e, &iter, em->bm, BM_EDGES_OF_MESH, NULL) { + BM_ITER_MESH (e, &iter, em->bm, BM_EDGES_OF_MESH) { if (BM_elem_flag_test(e, BM_ELEM_HIDDEN) || !e->l) continue; @@ -2278,11 +2278,11 @@ static int edbm_select_linked_flat_faces_exec(bContext *C, wmOperator *op) sharp = (sharp * M_PI) / 180.0; - BM_ITER (f, &iter, em->bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (f, &iter, em->bm, BM_FACES_OF_MESH) { BM_elem_flag_disable(f, BM_ELEM_TAG); } - BM_ITER (f, &iter, em->bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (f, &iter, em->bm, BM_FACES_OF_MESH) { if (BM_elem_flag_test(f, BM_ELEM_HIDDEN) || !BM_elem_flag_test(f, BM_ELEM_SELECT) || BM_elem_flag_test(f, BM_ELEM_TAG)) continue; @@ -2300,8 +2300,8 @@ static int edbm_select_linked_flat_faces_exec(bContext *C, wmOperator *op) BM_elem_flag_enable(f, BM_ELEM_TAG); - BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_FACE, f) { - BM_ITER (l2, &liter2, em->bm, BM_LOOPS_OF_LOOP, l) { + BM_ITER_ELEM (l, &liter, f, BM_LOOPS_OF_FACE) { + BM_ITER_ELEM (l2, &liter2, l, BM_LOOPS_OF_LOOP) { float angle; if (BM_elem_flag_test(l2->f, BM_ELEM_TAG) || BM_elem_flag_test(l2->f, BM_ELEM_HIDDEN)) @@ -2363,13 +2363,13 @@ static int edbm_select_non_manifold_exec(bContext *C, wmOperator *op) return OPERATOR_CANCELLED; } - BM_ITER (v, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { + BM_ITER_MESH (v, &iter, em->bm, BM_VERTS_OF_MESH) { if (!BM_elem_flag_test(v, BM_ELEM_HIDDEN) && !BM_vert_is_manifold(v)) { BM_elem_select_set(em->bm, v, TRUE); } } - BM_ITER (e, &iter, em->bm, BM_EDGES_OF_MESH, NULL) { + BM_ITER_MESH (e, &iter, em->bm, BM_EDGES_OF_MESH) { if (!BM_elem_flag_test(e, BM_ELEM_HIDDEN) && !BM_edge_is_manifold(e)) { BM_elem_select_set(em->bm, e, TRUE); } @@ -2411,7 +2411,7 @@ static int edbm_select_random_exec(bContext *C, wmOperator *op) EDBM_flag_disable_all(em, BM_ELEM_SELECT); if (em->selectmode & SCE_SELECT_VERTEX) { - BM_ITER (eve, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { + BM_ITER_MESH (eve, &iter, em->bm, BM_VERTS_OF_MESH) { if (!BM_elem_flag_test(eve, BM_ELEM_HIDDEN) && BLI_frand() < randfac) { BM_elem_select_set(em->bm, eve, TRUE); } @@ -2419,7 +2419,7 @@ static int edbm_select_random_exec(bContext *C, wmOperator *op) EDBM_selectmode_flush(em); } else if (em->selectmode & SCE_SELECT_EDGE) { - BM_ITER (eed, &iter, em->bm, BM_EDGES_OF_MESH, NULL) { + BM_ITER_MESH (eed, &iter, em->bm, BM_EDGES_OF_MESH) { if (!BM_elem_flag_test(eed, BM_ELEM_HIDDEN) && BLI_frand() < randfac) { BM_elem_select_set(em->bm, eed, TRUE); } @@ -2427,7 +2427,7 @@ static int edbm_select_random_exec(bContext *C, wmOperator *op) EDBM_selectmode_flush(em); } else { - BM_ITER (efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { if (!BM_elem_flag_test(efa, BM_ELEM_HIDDEN) && BLI_frand() < randfac) { BM_elem_select_set(em->bm, efa, TRUE); } @@ -2469,15 +2469,15 @@ static int edbm_select_next_loop_exec(bContext *C, wmOperator *UNUSED(op)) BMVert *v; BMIter iter; - BM_ITER (v, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { + BM_ITER_MESH (v, &iter, em->bm, BM_VERTS_OF_MESH) { BM_elem_flag_disable(v, BM_ELEM_TAG); } - BM_ITER (f, &iter, em->bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (f, &iter, em->bm, BM_FACES_OF_MESH) { BMLoop *l; BMIter liter; - BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_FACE, f) { + BM_ITER_ELEM (l, &liter, f, BM_LOOPS_OF_FACE) { if (BM_elem_flag_test(l->v, BM_ELEM_SELECT)) { BM_elem_flag_enable(l->next->v, BM_ELEM_TAG); BM_elem_select_set(em->bm, l->v, FALSE); @@ -2485,7 +2485,7 @@ static int edbm_select_next_loop_exec(bContext *C, wmOperator *UNUSED(op)) } } - BM_ITER (v, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { + BM_ITER_MESH (v, &iter, em->bm, BM_VERTS_OF_MESH) { if (BM_elem_flag_test(v, BM_ELEM_TAG)) { BM_elem_select_set(em->bm, v, TRUE); } @@ -2522,18 +2522,18 @@ static int edbm_region_to_loop_exec(bContext *C, wmOperator *UNUSED(op)) em_setup_viewcontext(C, &vc); - BM_ITER (e, &iter, em->bm, BM_EDGES_OF_MESH, NULL) { + BM_ITER_MESH (e, &iter, em->bm, BM_EDGES_OF_MESH) { BM_elem_flag_disable(e, BM_ELEM_TAG); } - BM_ITER (f, &iter, em->bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (f, &iter, em->bm, BM_FACES_OF_MESH) { BMLoop *l1, *l2; BMIter liter1, liter2; - BM_ITER (l1, &liter1, em->bm, BM_LOOPS_OF_FACE, f) { + BM_ITER_ELEM (l1, &liter1, f, BM_LOOPS_OF_FACE) { int tot = 0, totsel = 0; - BM_ITER (l2, &liter2, em->bm, BM_LOOPS_OF_EDGE, l1->e) { + BM_ITER_ELEM (l2, &liter2, l1->e, BM_LOOPS_OF_EDGE) { tot++; totsel += BM_elem_flag_test(l2->f, BM_ELEM_SELECT) != 0; } @@ -2545,7 +2545,7 @@ static int edbm_region_to_loop_exec(bContext *C, wmOperator *UNUSED(op)) EDBM_flag_disable_all(em, BM_ELEM_SELECT); - BM_ITER (e, &iter, em->bm, BM_EDGES_OF_MESH, NULL) { + BM_ITER_MESH (e, &iter, em->bm, BM_EDGES_OF_MESH) { if (BM_elem_flag_test(e, BM_ELEM_TAG) && !BM_elem_flag_test(e, BM_ELEM_HIDDEN)) BM_edge_select_set(em->bm, e, TRUE); } @@ -2597,11 +2597,11 @@ static int loop_find_region(BMEditMesh *em, BMLoop *l, int flag, f = BLI_array_pop(stack); BLI_array_append(region, f); - BM_ITER (l1, &liter1, em->bm, BM_LOOPS_OF_FACE, f) { + BM_ITER_ELEM (l1, &liter1, f, BM_LOOPS_OF_FACE) { if (BM_elem_flag_test(l1->e, flag)) continue; - BM_ITER (l2, &liter2, em->bm, BM_LOOPS_OF_EDGE, l1->e) { + BM_ITER_ELEM (l2, &liter2, l1->e, BM_LOOPS_OF_EDGE) { if (BLI_smallhash_haskey(fhash, (uintptr_t)l2->f)) continue; @@ -2644,11 +2644,11 @@ static int loop_find_regions(BMEditMesh *em, int selbigger) BLI_smallhash_init(&visithash); - BM_ITER (f, &iter, em->bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (f, &iter, em->bm, BM_FACES_OF_MESH) { BM_elem_flag_disable(f, BM_ELEM_TAG); } - BM_ITER (e, &iter, em->bm, BM_EDGES_OF_MESH, NULL) { + BM_ITER_MESH (e, &iter, em->bm, BM_EDGES_OF_MESH) { if (BM_elem_flag_test(e, BM_ELEM_SELECT)) { BLI_array_append(edges, e); BM_elem_flag_enable(e, BM_ELEM_TAG); @@ -2672,7 +2672,7 @@ static int loop_find_regions(BMEditMesh *em, int selbigger) if (!BM_elem_flag_test(e, BM_ELEM_TAG)) continue; - BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_EDGE, e) { + BM_ITER_ELEM (l, &liter, e, BM_LOOPS_OF_EDGE) { if (BLI_smallhash_haskey(&visithash, (uintptr_t)l->f)) continue; @@ -2699,7 +2699,7 @@ static int loop_find_regions(BMEditMesh *em, int selbigger) for (j = 0; j < tot; j++) { BM_elem_flag_enable(region[j], BM_ELEM_TAG); - BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_FACE, region[j]) { + BM_ITER_ELEM (l, &liter, region[j], BM_LOOPS_OF_FACE) { BM_elem_flag_disable(l->e, BM_ELEM_TAG); } } @@ -2735,7 +2735,7 @@ static int edbm_loop_to_region_exec(bContext *C, wmOperator *op) EDBM_flag_disable_all(em, BM_ELEM_SELECT); - BM_ITER (f, &iter, em->bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (f, &iter, em->bm, BM_FACES_OF_MESH) { if (BM_elem_flag_test(f, BM_ELEM_TAG) && !BM_elem_flag_test(f, BM_ELEM_HIDDEN)) { BM_face_select_set(em->bm, f, TRUE); } diff --git a/source/blender/editors/mesh/editmesh_slide.c b/source/blender/editors/mesh/editmesh_slide.c index f678999311d..dd68cd30cf5 100644 --- a/source/blender/editors/mesh/editmesh_slide.c +++ b/source/blender/editors/mesh/editmesh_slide.c @@ -504,7 +504,7 @@ static int vtx_slide_set_frame(VertexSlideOp *vso) } /* Iterate over edges of vertex and copy them */ - BM_ITER_INDEX (edge, &iter, bm, BM_EDGES_OF_VERT, sel_vtx, idx) { + BM_ITER_ELEM_INDEX (edge, &iter, sel_vtx, BM_EDGES_OF_VERT, idx) { curr_vert = BM_edge_other_vert(edge, sel_vtx); if (curr_vert) { BLI_array_growone(vtx_frame); diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c index ba280878b2a..ce1ecf2a12e 100644 --- a/source/blender/editors/mesh/editmesh_tools.c +++ b/source/blender/editors/mesh/editmesh_tools.c @@ -159,7 +159,7 @@ void EMBM_project_snap_verts(bContext *C, ARegion *ar, Object *obedit, BMEditMes BMIter iter; BMVert *eve; - BM_ITER (eve, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { + BM_ITER_MESH (eve, &iter, em->bm, BM_VERTS_OF_MESH) { if (BM_elem_flag_test(eve, BM_ELEM_SELECT)) { float mval[2], vec[3], no_dummy[3]; int dist_dummy; @@ -194,7 +194,7 @@ static short edbm_extrude_face_indiv(BMEditMesh *em, wmOperator *op, const char BM_elem_select_set(em->bm, f, TRUE); /* set face vertex normals to face normal */ - BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_FACE, f) { + BM_ITER_ELEM (l, &liter, f, BM_LOOPS_OF_FACE) { copy_v3_v3(l->v->no, f->no); } } @@ -734,7 +734,7 @@ static int edbm_dupli_extrude_cursor_invoke(bContext *C, wmOperator *op, wmEvent INIT_MINMAX(min, max); - BM_ITER (v1, &iter, vc.em->bm, BM_VERTS_OF_MESH, NULL) { + BM_ITER_MESH (v1, &iter, vc.em->bm, BM_VERTS_OF_MESH) { if (BM_elem_flag_test(v1, BM_ELEM_SELECT)) { DO_MINMAX(v1->co, min, max); done = 1; @@ -756,7 +756,7 @@ static int edbm_dupli_extrude_cursor_invoke(bContext *C, wmOperator *op, wmEvent /* check for edges that are half selected, use for rotation */ done = 0; - BM_ITER (eed, &iter, vc.em->bm, BM_EDGES_OF_MESH, NULL) { + BM_ITER_MESH (eed, &iter, vc.em->bm, BM_EDGES_OF_MESH) { if (BM_elem_flag_test(eed, BM_ELEM_SELECT)) { float co1[3], co2[3]; mul_v3_m4v3(co1, vc.obedit->obmat, eed->v1->co); @@ -1074,7 +1074,7 @@ static int edbm_mark_seam(bContext *C, wmOperator *op) } if (clear) { - BM_ITER (eed, &iter, bm, BM_EDGES_OF_MESH, NULL) { + BM_ITER_MESH (eed, &iter, bm, BM_EDGES_OF_MESH) { if (!BM_elem_flag_test(eed, BM_ELEM_SELECT) || BM_elem_flag_test(eed, BM_ELEM_HIDDEN)) continue; @@ -1082,7 +1082,7 @@ static int edbm_mark_seam(bContext *C, wmOperator *op) } } else { - BM_ITER (eed, &iter, bm, BM_EDGES_OF_MESH, NULL) { + BM_ITER_MESH (eed, &iter, bm, BM_EDGES_OF_MESH) { if (!BM_elem_flag_test(eed, BM_ELEM_SELECT) || BM_elem_flag_test(eed, BM_ELEM_HIDDEN)) continue; BM_elem_flag_enable(eed, BM_ELEM_SEAM); @@ -1128,7 +1128,7 @@ static int edbm_mark_sharp(bContext *C, wmOperator *op) } if (!clear) { - BM_ITER (eed, &iter, bm, BM_EDGES_OF_MESH, NULL) { + BM_ITER_MESH (eed, &iter, bm, BM_EDGES_OF_MESH) { if (!BM_elem_flag_test(eed, BM_ELEM_SELECT) || BM_elem_flag_test(eed, BM_ELEM_HIDDEN)) continue; @@ -1136,7 +1136,7 @@ static int edbm_mark_sharp(bContext *C, wmOperator *op) } } else { - BM_ITER (eed, &iter, bm, BM_EDGES_OF_MESH, NULL) { + BM_ITER_MESH (eed, &iter, bm, BM_EDGES_OF_MESH) { if (!BM_elem_flag_test(eed, BM_ELEM_SELECT) || BM_elem_flag_test(eed, BM_ELEM_HIDDEN)) continue; @@ -1340,7 +1340,7 @@ static int edbm_edge_rotate_selected_exec(bContext *C, wmOperator *op) } /* first see if we have two adjacent faces */ - BM_ITER (eed, &iter, em->bm, BM_EDGES_OF_MESH, NULL) { + BM_ITER_MESH (eed, &iter, em->bm, BM_EDGES_OF_MESH) { BM_elem_flag_disable(eed, BM_ELEM_TAG); if (BM_elem_flag_test(eed, BM_ELEM_SELECT)) { BMFace *fa, *fb; @@ -1580,7 +1580,7 @@ static void mesh_set_smooth_faces(BMEditMesh *em, short smooth) if (em == NULL) return; - BM_ITER (efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { if (BM_elem_flag_test(efa, BM_ELEM_SELECT)) { BM_elem_flag_set(efa, BM_ELEM_SMOOTH, smooth); } @@ -1862,7 +1862,7 @@ static int merge_target(BMEditMesh *em, Scene *scene, View3D *v3d, Object *ob, else { float fac; int i = 0; - BM_ITER (v, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { + BM_ITER_MESH (v, &iter, em->bm, BM_VERTS_OF_MESH) { if (!BM_elem_flag_test(v, BM_ELEM_SELECT)) continue; add_v3_v3(cent, v->co); @@ -2148,7 +2148,7 @@ static void shape_propagate(BMEditMesh *em, wmOperator *op) return; } - BM_ITER (eve, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { + BM_ITER_MESH (eve, &iter, em->bm, BM_VERTS_OF_MESH) { if (!BM_elem_flag_test(eve, BM_ELEM_SELECT) || BM_elem_flag_test(eve, BM_ELEM_HIDDEN)) continue; @@ -2217,7 +2217,7 @@ static int edbm_blend_from_shape_exec(bContext *C, wmOperator *op) if (totshape == 0 || shape < 0 || shape >= totshape) return OPERATOR_CANCELLED; - BM_ITER (eve, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { + BM_ITER_MESH (eve, &iter, em->bm, BM_VERTS_OF_MESH) { if (!BM_elem_flag_test(eve, BM_ELEM_SELECT) || BM_elem_flag_test(eve, BM_ELEM_HIDDEN)) continue; @@ -2322,7 +2322,7 @@ static int edbm_select_axis_exec(bContext *C, wmOperator *op) else if (mode == 1) value += limit; - BM_ITER (ev, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { + BM_ITER_MESH (ev, &iter, em->bm, BM_VERTS_OF_MESH) { if (!BM_elem_flag_test(ev, BM_ELEM_HIDDEN)) { switch (mode) { case -1: /* aligned */ @@ -2796,7 +2796,7 @@ static int mesh_separate_selected(Main *bmain, Scene *scene, Base *editbase, wmO EDBM_op_callf(em, wmop, "del geom=%hvef context=%i", BM_ELEM_SELECT, DEL_FACES); /* clean up any loose edges */ - BM_ITER (e, &iter, em->bm, BM_EDGES_OF_MESH, NULL) { + BM_ITER_MESH (e, &iter, em->bm, BM_EDGES_OF_MESH) { if (BM_elem_flag_test(e, BM_ELEM_HIDDEN)) continue; @@ -2807,7 +2807,7 @@ static int mesh_separate_selected(Main *bmain, Scene *scene, Base *editbase, wmO EDBM_op_callf(em, wmop, "del geom=%hvef context=%i", BM_ELEM_SELECT, DEL_EDGES); /* clean up any loose verts */ - BM_ITER (v, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { + BM_ITER_MESH (v, &iter, em->bm, BM_VERTS_OF_MESH) { if (BM_elem_flag_test(v, BM_ELEM_HIDDEN)) continue; @@ -2843,7 +2843,7 @@ static int mesh_separate_material(Main *bmain, Scene *scene, Base *editbase, wmO const short mat_nr = f_cmp->mat_nr; int tot = 0; - BM_ITER (f, &iter, bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (f, &iter, bm, BM_FACES_OF_MESH) { if (f->mat_nr == mat_nr) { BM_face_select_set(bm, f, TRUE); tot++; @@ -2887,7 +2887,7 @@ static int mesh_separate_loose(Main *bmain, Scene *scene, Base *editbase, wmOper for (i = 0; i < max_iter; i++) { /* Get a seed vertex to start the walk */ v_seed = NULL; - BM_ITER (v, &iter, bm, BM_VERTS_OF_MESH, NULL) { + BM_ITER_MESH (v, &iter, bm, BM_VERTS_OF_MESH) { v_seed = v; break; } @@ -3661,7 +3661,7 @@ static void xsortvert_flag(bContext *C, int flag) sortblock = MEM_callocN(sizeof(xvertsort) * totvert, "xsort sorted"); /* Stores unchanged verts, will be reused as final old2new vert mapping... */ unchangedblock = MEM_callocN(sizeof(int) * totvert, "xsort unchanged"); - BM_ITER_INDEX (ve, &iter, em->bm, BM_VERTS_OF_MESH, NULL, i) { + BM_ITER_MESH_INDEX (ve, &iter, em->bm, BM_VERTS_OF_MESH, i) { if (BM_elem_flag_test(ve, flag)) { sortblock[i].org_idx = i; sorted++; @@ -4022,7 +4022,7 @@ static int edbm_noise_exec(bContext *C, wmOperator *op) if (tex->type == TEX_STUCCI) { float b2, vec[3]; float ofs = tex->turbul / 200.0; - BM_ITER (eve, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { + BM_ITER_MESH (eve, &iter, em->bm, BM_VERTS_OF_MESH) { if (BM_elem_flag_test(eve, BM_ELEM_SELECT)) { b2 = BLI_hnoise(tex->noisesize, eve->co[0], eve->co[1], eve->co[2]); if (tex->stype) ofs *= (b2 * b2); @@ -4035,7 +4035,7 @@ static int edbm_noise_exec(bContext *C, wmOperator *op) } } else { - BM_ITER (eve, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { + BM_ITER_MESH (eve, &iter, em->bm, BM_VERTS_OF_MESH) { if (BM_elem_flag_test(eve, BM_ELEM_SELECT)) { float tin, dum; externtex(ma->mtex[0], eve->co, &tin, &dum, &dum, &dum, &dum, 0); @@ -4086,7 +4086,7 @@ static int edbm_bevel_exec(bContext *C, wmOperator *op) BM_data_layer_add(em->bm, &em->bm->edata, CD_PROP_FLT); li = CustomData_number_of_layers(&em->bm->edata, CD_PROP_FLT) - 1; - BM_ITER (eed, &iter, em->bm, BM_EDGES_OF_MESH, NULL) { + BM_ITER_MESH (eed, &iter, em->bm, BM_EDGES_OF_MESH) { float d = len_v3v3(eed->v1->co, eed->v2->co); float *dv = CustomData_bmesh_get_n(&em->bm->edata, eed->head.data, CD_PROP_FLT, li); diff --git a/source/blender/editors/mesh/editmesh_utils.c b/source/blender/editors/mesh/editmesh_utils.c index 13e059bb5d8..b006f77200e 100644 --- a/source/blender/editors/mesh/editmesh_utils.c +++ b/source/blender/editors/mesh/editmesh_utils.c @@ -614,7 +614,7 @@ UvVertMap *EDBM_uv_vert_map_create(BMEditMesh *em, int selected, int do_face_idx totuv = 0; /* generate UvMapVert array */ - BM_ITER (efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { if (!selected || ((!BM_elem_flag_test(efa, BM_ELEM_HIDDEN)) && BM_elem_flag_test(efa, BM_ELEM_SELECT))) totuv += efa->len; } @@ -642,10 +642,10 @@ UvVertMap *EDBM_uv_vert_map_create(BMEditMesh *em, int selected, int do_face_idx } a = 0; - BM_ITER (efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { if (!selected || ((!BM_elem_flag_test(efa, BM_ELEM_HIDDEN)) && BM_elem_flag_test(efa, BM_ELEM_SELECT))) { i = 0; - BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { + BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) { buf->tfindex = i; buf->f = a; buf->separate = 0; @@ -663,7 +663,7 @@ UvVertMap *EDBM_uv_vert_map_create(BMEditMesh *em, int selected, int do_face_idx /* sort individual uvs for each vert */ a = 0; - BM_ITER (ev, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { + BM_ITER_MESH (ev, &iter, em->bm, BM_VERTS_OF_MESH) { UvMapVert *newvlist = NULL, *vlist = vmap->vert[a]; UvMapVert *iterv, *v, *lastv, *next; float *uv, *uv2, uvdiff[2]; @@ -762,7 +762,7 @@ UvElementMap *EDBM_uv_element_map_create(BMEditMesh *em, int selected, int do_is } /* generate UvElement array */ - BM_ITER (efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { if (!selected || ((!BM_elem_flag_test(efa, BM_ELEM_HIDDEN)) && BM_elem_flag_test(efa, BM_ELEM_SELECT))) totuv += efa->len; } @@ -787,10 +787,10 @@ UvElementMap *EDBM_uv_element_map_create(BMEditMesh *em, int selected, int do_is } j = 0; - BM_ITER (efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { island_number[j++] = INVALID_ISLAND; if (!selected || ((!BM_elem_flag_test(efa, BM_ELEM_HIDDEN)) && BM_elem_flag_test(efa, BM_ELEM_SELECT))) { - BM_ITER_INDEX (l, &liter, em->bm, BM_LOOPS_OF_FACE, efa, i) { + BM_ITER_ELEM_INDEX (l, &liter, efa, BM_LOOPS_OF_FACE, i) { buf->l = l; buf->face = efa; buf->separate = 0; @@ -807,7 +807,7 @@ UvElementMap *EDBM_uv_element_map_create(BMEditMesh *em, int selected, int do_is /* sort individual uvs for each vert */ i = 0; - BM_ITER (ev, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { + BM_ITER_MESH (ev, &iter, em->bm, BM_VERTS_OF_MESH) { UvElement *newvlist = NULL, *vlist = element_map->vert[i]; UvElement *iterv, *v, *lastv, *next; float *uv, *uv2, uvdiff[2]; @@ -871,7 +871,7 @@ UvElementMap *EDBM_uv_element_map_create(BMEditMesh *em, int selected, int do_is while (stacksize > 0) { efa = stack[--stacksize]; - BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { + BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) { UvElement *element, *initelement = element_map->vert[BM_elem_index_get(l->v)]; for (element = initelement; element; element = element->next) { @@ -1019,7 +1019,7 @@ static BMVert *cache_mirr_intptr_as_bmvert(intptr_t *index_lookup, int index) * EDBM_verts_mirror_cache_begin(em); * ... * ... - * BM_ITER (v, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { + * BM_ITER_MESH (v, &iter, em->bm, BM_VERTS_OF_MESH) { * mirrorv = EDBM_verts_mirror_get(em, v); * } * ... @@ -1071,7 +1071,7 @@ void EDBM_verts_mirror_cache_begin(BMEditMesh *em, const short use_select) tree = BMBVH_NewBVH(em, 0, NULL, NULL); } - BM_ITER (v, &iter, bm, BM_VERTS_OF_MESH, NULL) { + BM_ITER_MESH (v, &iter, bm, BM_VERTS_OF_MESH) { /* temporary for testing, check for selection */ if (use_select && !BM_elem_flag_test(v, BM_ELEM_SELECT)) { @@ -1159,7 +1159,7 @@ void EDBM_verts_mirror_apply(BMEditMesh *em, const int sel_from, const int sel_t BLI_assert(em->vert_index != NULL); - BM_ITER (v, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { + BM_ITER_MESH (v, &iter, em->bm, BM_VERTS_OF_MESH) { if (BM_elem_flag_test(v, BM_ELEM_SELECT) == sel_from) { BMVert *mirr = EDBM_verts_mirror_get(em, v); if (mirr) { diff --git a/source/blender/editors/mesh/mesh_data.c b/source/blender/editors/mesh/mesh_data.c index d3c0a1245fc..d1fb437e114 100644 --- a/source/blender/editors/mesh/mesh_data.c +++ b/source/blender/editors/mesh/mesh_data.c @@ -199,7 +199,7 @@ static void editmesh_face_copy_customdata(BMEditMesh *em, int type, int index) const int n = CustomData_get_active_layer(pdata, type); /* ensure all current elements follow new customdata layout */ - BM_ITER (efa, &iter, bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, bm, BM_FACES_OF_MESH) { void *data = CustomData_bmesh_get_n(pdata, efa->head.data, type, n); CustomData_bmesh_set_n(pdata, efa->head.data, type, index, data); } @@ -217,8 +217,8 @@ static void editmesh_loop_copy_customdata(BMEditMesh *em, int type, int index) const int n = CustomData_get_active_layer(ldata, type); /* ensure all current elements follow new customdata layout */ - BM_ITER (efa, &iter, bm, BM_FACES_OF_MESH, NULL) { - BM_ITER (loop, &liter, bm, BM_LOOPS_OF_FACE, efa) { + BM_ITER_MESH (efa, &iter, bm, BM_FACES_OF_MESH) { + BM_ITER_ELEM (loop, &liter, efa, BM_LOOPS_OF_FACE) { void *data = CustomData_bmesh_get_n(ldata, loop->head.data, type, n); CustomData_bmesh_set_n(ldata, loop->head.data, type, index, data); } @@ -245,12 +245,12 @@ int ED_mesh_uv_loop_reset_ex(struct bContext *C, struct Mesh *me, const int laye BLI_assert(CustomData_has_layer(&em->bm->ldata, CD_MLOOPUV)); - BM_ITER (efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { if (!BM_elem_flag_test(efa, BM_ELEM_SELECT)) continue; i = 0; - BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { + BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) { luv = CustomData_bmesh_get_n(&em->bm->ldata, l->head.data, CD_MLOOPUV, layernum); BLI_array_append(uvs, luv->uv); i++; diff --git a/source/blender/editors/mesh/mesh_navmesh.c b/source/blender/editors/mesh/mesh_navmesh.c index 3d57c5144de..71aaacb7e49 100644 --- a/source/blender/editors/mesh/mesh_navmesh.c +++ b/source/blender/editors/mesh/mesh_navmesh.c @@ -500,7 +500,7 @@ static int navmesh_face_copy_exec(bContext *C, wmOperator *op) if (targetPolyIdx > 0) { /* set target poly idx to other selected faces */ - BM_ITER (efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { if (BM_elem_flag_test(efa, BM_ELEM_SELECT) && efa != efa_act) { int *recastDataBlock = (int *)CustomData_bmesh_get(&em->bm->pdata, efa->head.data, CD_RECAST); *recastDataBlock = targetPolyIdx; @@ -549,7 +549,7 @@ static int findFreeNavPolyIndex(BMEditMesh *em) int i, idx = em->bm->totface - 1, freeIdx = 1; /*XXX this originally went last to first, but that isn't possible anymore*/ - BM_ITER (ef, &iter, em->bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (ef, &iter, em->bm, BM_FACES_OF_MESH) { int polyIdx = *(int *)CustomData_bmesh_get(&em->bm->pdata, ef->head.data, CD_RECAST); indices[idx] = polyIdx; idx--; @@ -585,7 +585,7 @@ static int navmesh_face_add_exec(bContext *C, wmOperator *UNUSED(op)) /* set target poly idx to selected faces */ /*XXX this originally went last to first, but that isn't possible anymore*/ - BM_ITER (ef, &iter, em->bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (ef, &iter, em->bm, BM_FACES_OF_MESH) { if (BM_elem_flag_test(ef, BM_ELEM_SELECT)) { int *recastDataBlock = (int *)CustomData_bmesh_get(&em->bm->pdata, ef->head.data, CD_RECAST); *recastDataBlock = targetPolyIdx; diff --git a/source/blender/editors/mesh/meshtools.c b/source/blender/editors/mesh/meshtools.c index c10173ec19c..7c02f26dbdc 100644 --- a/source/blender/editors/mesh/meshtools.c +++ b/source/blender/editors/mesh/meshtools.c @@ -803,7 +803,7 @@ intptr_t mesh_octree_table(Object *ob, BMEditMesh *em, float *co, char mode) BMIter iter; BMVert *eve; - BM_ITER (eve, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { + BM_ITER_MESH (eve, &iter, em->bm, BM_VERTS_OF_MESH) { DO_MINMAX(eve->co, min, max); } } @@ -840,7 +840,7 @@ intptr_t mesh_octree_table(Object *ob, BMEditMesh *em, float *co, char mode) 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) { mesh_octree_add_nodes(MeshOctree.table, eve->co, MeshOctree.offs, MeshOctree.div, (intptr_t)(eve)); } } @@ -953,7 +953,7 @@ static BMVert *editbmesh_get_x_mirror_vert_topo(Object *ob, struct BMEditMesh *e BMVert *v; index = 0; - BM_ITER (v, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { + BM_ITER_MESH (v, &iter, em->bm, BM_VERTS_OF_MESH) { if (v == eve) break; index++; @@ -1015,14 +1015,14 @@ static float *editmesh_get_mirror_uv(BMEditMesh *em, int axis, float *uv, float BMIter iter; BMFace *efa; - BM_ITER (efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { poly_uv_center(em, efa, cent); if ( (fabs(cent[0] - cent_vec[0]) < 0.001) && (fabs(cent[1] - cent_vec[1]) < 0.001) ) { BMIter liter; BMLoop *l; - 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 ( (fabs(luv->uv[0] - vec[0]) < 0.001) && (fabs(luv->uv[1] - vec[1]) < 0.001) ) { return luv->uv; diff --git a/source/blender/editors/object/object_hook.c b/source/blender/editors/object/object_hook.c index e2b77d62386..ce4984384ba 100644 --- a/source/blender/editors/object/object_hook.c +++ b/source/blender/editors/object/object_hook.c @@ -78,7 +78,7 @@ static int return_editmesh_indexar(BMEditMesh *em, int *tot, int **indexar, floa BMIter iter; int *index, nr, totvert=0; - BM_ITER (eve, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { + BM_ITER_MESH (eve, &iter, em->bm, BM_VERTS_OF_MESH) { if (BM_elem_flag_test(eve, BM_ELEM_SELECT)) totvert++; } if (totvert==0) return 0; @@ -88,7 +88,7 @@ static int return_editmesh_indexar(BMEditMesh *em, int *tot, int **indexar, floa nr= 0; zero_v3(cent); - BM_ITER (eve, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { + BM_ITER_MESH (eve, &iter, em->bm, BM_VERTS_OF_MESH) { if (BM_elem_flag_test(eve, BM_ELEM_SELECT)) { *index= nr; index++; add_v3_v3(cent, eve->co); @@ -114,7 +114,7 @@ static int return_editmesh_vgroup(Object *obedit, BMEditMesh *em, char *name, fl BMIter iter; /* find the vertices */ - BM_ITER (eve, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { + BM_ITER_MESH (eve, &iter, em->bm, BM_VERTS_OF_MESH) { dvert= CustomData_bmesh_get(&em->bm->vdata, eve->head.data, CD_MDEFORMVERT); if (dvert) { @@ -146,7 +146,7 @@ static void select_editbmesh_hook(Object *ob, HookModifierData *hmd) if (hmd->indexar == NULL) return; - BM_ITER (eve, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { + BM_ITER_MESH (eve, &iter, em->bm, BM_VERTS_OF_MESH) { if (nr==hmd->indexar[index]) { BM_elem_select_set(em->bm, eve, TRUE); if (index < hmd->totindex-1) index++; diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c index b7207896e60..7ee57dd78d3 100644 --- a/source/blender/editors/object/object_relations.c +++ b/source/blender/editors/object/object_relations.c @@ -137,7 +137,7 @@ static int vertex_parent_set_exec(bContext *C, wmOperator *op) * so re-create it here */ makeDerivedMesh(scene, obedit, em, CD_MASK_BAREMESH, 0); - BM_ITER (eve, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { + BM_ITER_MESH (eve, &iter, em->bm, BM_VERTS_OF_MESH) { if (BM_elem_flag_test(eve, BM_ELEM_SELECT)) { if (v1==0) v1= nr; else if (v2==0) v2= nr; diff --git a/source/blender/editors/object/object_transform.c b/source/blender/editors/object/object_transform.c index 84861e9bf5d..55954790687 100644 --- a/source/blender/editors/object/object_transform.c +++ b/source/blender/editors/object/object_transform.c @@ -687,7 +687,7 @@ static int object_origin_set_exec(bContext *C, wmOperator *op) mul_m4_v3(obedit->imat, cent); } else { - BM_ITER (eve, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { + BM_ITER_MESH (eve, &iter, em->bm, BM_VERTS_OF_MESH) { if (around==V3D_CENTROID) { total++; add_v3_v3(cent, eve->co); @@ -700,7 +700,7 @@ static int object_origin_set_exec(bContext *C, wmOperator *op) } } - BM_ITER (eve, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { + BM_ITER_MESH (eve, &iter, em->bm, BM_VERTS_OF_MESH) { sub_v3_v3(eve->co, cent); } diff --git a/source/blender/editors/object/object_vgroup.c b/source/blender/editors/object/object_vgroup.c index 9b00dd9ac2b..81810c793b8 100644 --- a/source/blender/editors/object/object_vgroup.c +++ b/source/blender/editors/object/object_vgroup.c @@ -206,14 +206,14 @@ static int ED_vgroup_give_parray(ID *id, MDeformVert ***dvert_arr, int *dvert_to i = 0; if (use_vert_sel) { - BM_ITER (eve, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { + BM_ITER_MESH (eve, &iter, em->bm, BM_VERTS_OF_MESH) { (*dvert_arr)[i] = BM_elem_flag_test(eve, BM_ELEM_SELECT) ? CustomData_bmesh_get(&em->bm->vdata, eve->head.data, CD_MDEFORMVERT) : NULL; i++; } } else { - BM_ITER (eve, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { + BM_ITER_MESH (eve, &iter, em->bm, BM_VERTS_OF_MESH) { (*dvert_arr)[i] = CustomData_bmesh_get(&em->bm->vdata, eve->head.data, CD_MDEFORMVERT); i++; } @@ -593,7 +593,7 @@ static void vgroup_select_verts(Object *ob, int select) BMIter iter; BMVert *eve; - BM_ITER (eve, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { + BM_ITER_MESH (eve, &iter, em->bm, BM_VERTS_OF_MESH) { if (!BM_elem_flag_test(eve, BM_ELEM_HIDDEN)) { dv= CustomData_bmesh_get(&em->bm->vdata, eve->head.data, CD_MDEFORMVERT); if (defvert_find_index(dv, def_nr)) { @@ -1296,7 +1296,7 @@ static void vgroup_blend(Object *ob, const float fac) vg_users = MEM_callocN(sizeof(int) * dvert_tot, "vgroup_blend_i"); if (bm) { - BM_ITER (eed, &iter, bm, BM_EDGES_OF_MESH, NULL) { + BM_ITER_MESH (eed, &iter, bm, BM_EDGES_OF_MESH) { sel1 = BM_elem_flag_test(eed->v1, BM_ELEM_SELECT); sel2 = BM_elem_flag_test(eed->v2, BM_ELEM_SELECT); @@ -1322,7 +1322,7 @@ static void vgroup_blend(Object *ob, const float fac) } } - BM_ITER_INDEX (eve, &iter, bm, BM_VERTS_OF_MESH, NULL, i) { + BM_ITER_MESH_INDEX (eve, &iter, bm, BM_VERTS_OF_MESH, i) { if (BM_elem_flag_test(eve, BM_ELEM_SELECT) && vg_users[i] > 0) { dv = CustomData_bmesh_get(&bm->vdata, eve->head.data, CD_MDEFORMVERT); @@ -1571,7 +1571,7 @@ void ED_vgroup_mirror(Object *ob, const short mirror_weights, const short flip_v EDBM_verts_mirror_cache_begin(em, FALSE); /* Go through the list of editverts and assign them */ - BM_ITER (eve, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { + BM_ITER_MESH (eve, &iter, em->bm, BM_VERTS_OF_MESH) { if ((eve_mirr= EDBM_verts_mirror_get(em, eve))) { sel= BM_elem_flag_test(eve, BM_ELEM_SELECT); sel_mirr= BM_elem_flag_test(eve_mirr, BM_ELEM_SELECT); @@ -1796,7 +1796,7 @@ static void vgroup_active_remove_verts(Object *ob, const int allverts, bDeformGr 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) { dv= CustomData_bmesh_get(&em->bm->vdata, eve->head.data, CD_MDEFORMVERT); if (dv && dv->dw && (allverts || BM_elem_flag_test(eve, BM_ELEM_SELECT))) { @@ -1866,7 +1866,7 @@ static void vgroup_delete_edit_mode(Object *ob, bDeformGroup *dg) BMVert *eve; MDeformVert *dvert; - BM_ITER (eve, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { + BM_ITER_MESH (eve, &iter, em->bm, BM_VERTS_OF_MESH) { dvert= CustomData_bmesh_get(&em->bm->vdata, eve->head.data, CD_MDEFORMVERT); if (dvert) @@ -1998,7 +1998,7 @@ static void vgroup_assign_verts(Object *ob, const float weight) BM_data_layer_add(em->bm, &em->bm->vdata, CD_MDEFORMVERT); /* Go through the list of editverts and assign them */ - BM_ITER (eve, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { + BM_ITER_MESH (eve, &iter, em->bm, BM_VERTS_OF_MESH) { if (BM_elem_flag_test(eve, BM_ELEM_SELECT)) { MDeformWeight *dw; dv= CustomData_bmesh_get(&em->bm->vdata, eve->head.data, CD_MDEFORMVERT); /* can be NULL */ @@ -2855,7 +2855,7 @@ static int vgroup_do_remap(Object *ob, char *name_array, wmOperator *op) BMIter iter; BMVert *eve; - BM_ITER (eve, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { + BM_ITER_MESH (eve, &iter, em->bm, BM_VERTS_OF_MESH) { dvert= CustomData_bmesh_get(&em->bm->vdata, eve->head.data, CD_MDEFORMVERT); if (dvert && dvert->totweight) { defvert_remap(dvert, sort_map, defbase_tot); diff --git a/source/blender/editors/render/render_shading.c b/source/blender/editors/render/render_shading.c index 87c225e064e..6722ac5e686 100644 --- a/source/blender/editors/render/render_shading.c +++ b/source/blender/editors/render/render_shading.c @@ -170,7 +170,7 @@ static int material_slot_assign_exec(bContext *C, wmOperator *UNUSED(op)) BMIter iter; if (em) { - BM_ITER (efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { if (BM_elem_flag_test(efa, BM_ELEM_SELECT)) efa->mat_nr = ob->actcol - 1; } diff --git a/source/blender/editors/sculpt_paint/sculpt_uv.c b/source/blender/editors/sculpt_paint/sculpt_uv.c index 5fe043ab8d5..4b866c3c9c3 100644 --- a/source/blender/editors/sculpt_paint/sculpt_uv.c +++ b/source/blender/editors/sculpt_paint/sculpt_uv.c @@ -594,8 +594,8 @@ static UvSculptData *uv_sculpt_stroke_init(bContext *C, wmOperator *op, wmEvent /* Now, on to generate our uv connectivity data */ counter = 0; - BM_ITER (efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { - BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { + BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { + BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) { int offset1, itmp1 = uv_element_offset_from_face_get(data->elementMap, efa, l, island_index, do_island_optimization); int offset2, itmp2 = uv_element_offset_from_face_get(data->elementMap, efa, l->next, island_index, do_island_optimization); diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index d520c98c6d0..7f2e42f18e9 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -2957,7 +2957,7 @@ static void draw_em_indices(BMEditMesh *em) i = 0; if (em->selectmode & SCE_SELECT_VERTEX) { UI_GetThemeColor3ubv(TH_DRAWEXTRA_FACEANG, col); - BM_ITER (v, &iter, bm, BM_VERTS_OF_MESH, NULL) { + BM_ITER_MESH (v, &iter, bm, BM_VERTS_OF_MESH) { if (BM_elem_flag_test(v, BM_ELEM_SELECT)) { sprintf(numstr, "%d", i); view3d_cached_text_draw_add(v->co, numstr, 0, txt_flag, col); @@ -2969,7 +2969,7 @@ static void draw_em_indices(BMEditMesh *em) if (em->selectmode & SCE_SELECT_EDGE) { i = 0; UI_GetThemeColor3ubv(TH_DRAWEXTRA_EDGELEN, col); - BM_ITER (e, &iter, bm, BM_EDGES_OF_MESH, NULL) { + BM_ITER_MESH (e, &iter, bm, BM_EDGES_OF_MESH) { if (BM_elem_flag_test(e, BM_ELEM_SELECT)) { sprintf(numstr, "%d", i); mid_v3_v3v3(pos, e->v1->co, e->v2->co); @@ -2982,7 +2982,7 @@ static void draw_em_indices(BMEditMesh *em) if (em->selectmode & SCE_SELECT_FACE) { i = 0; UI_GetThemeColor3ubv(TH_DRAWEXTRA_FACEAREA, col); - BM_ITER (f, &iter, bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (f, &iter, bm, BM_FACES_OF_MESH) { if (BM_elem_flag_test(f, BM_ELEM_SELECT)) { BM_face_center_mean_calc(bm, f, pos); sprintf(numstr, "%d", i); diff --git a/source/blender/editors/space_view3d/view3d_buttons.c b/source/blender/editors/space_view3d/view3d_buttons.c index a3bf0d40c43..88d78442587 100644 --- a/source/blender/editors/space_view3d/view3d_buttons.c +++ b/source/blender/editors/space_view3d/view3d_buttons.c @@ -157,7 +157,7 @@ static void v3d_editvertex_buts(uiLayout *layout, View3D *v3d, Object *ob, float BMEdge *eed; BMIter iter; - BM_ITER (eve, &iter, bm, BM_VERTS_OF_MESH, NULL) { + BM_ITER_MESH (eve, &iter, bm, BM_VERTS_OF_MESH) { if (BM_elem_flag_test(eve, BM_ELEM_SELECT)) { evedef = eve; tot++; @@ -165,7 +165,7 @@ static void v3d_editvertex_buts(uiLayout *layout, View3D *v3d, Object *ob, float } } - BM_ITER (eed, &iter, bm, BM_EDGES_OF_MESH, NULL) { + BM_ITER_MESH (eed, &iter, bm, BM_EDGES_OF_MESH) { if (BM_elem_flag_test(eed, BM_ELEM_SELECT)) { float *f; @@ -404,7 +404,7 @@ static void v3d_editvertex_buts(uiLayout *layout, View3D *v3d, Object *ob, float if (len_v3(median) > 0.000001f) { - BM_ITER (eve, &iter, bm, BM_VERTS_OF_MESH, NULL) { + BM_ITER_MESH (eve, &iter, bm, BM_VERTS_OF_MESH) { if (BM_elem_flag_test(eve, BM_ELEM_SELECT)) { add_v3_v3(eve->co, median); } @@ -418,7 +418,7 @@ static void v3d_editvertex_buts(uiLayout *layout, View3D *v3d, Object *ob, float const float sca = compute_scale_factor(ve_median[3], median[3]); if (ELEM(sca, 0.0f, 1.0f)) { - BM_ITER (eed, &iter, bm, BM_EDGES_OF_MESH, NULL) { + BM_ITER_MESH (eed, &iter, bm, BM_EDGES_OF_MESH) { if (BM_elem_flag_test(eed, BM_ELEM_SELECT)) { float *crease = (float *)CustomData_bmesh_get(&bm->edata, eed->head.data, CD_CREASE); if (crease) { @@ -428,7 +428,7 @@ static void v3d_editvertex_buts(uiLayout *layout, View3D *v3d, Object *ob, float } } else if (sca > 0.0f) { - BM_ITER (eed, &iter, bm, BM_EDGES_OF_MESH, NULL) { + BM_ITER_MESH (eed, &iter, bm, BM_EDGES_OF_MESH) { if (BM_elem_flag_test(eed, BM_ELEM_SELECT) && !BM_elem_flag_test(eed, BM_ELEM_HIDDEN)) { float *crease = (float *)CustomData_bmesh_get(&bm->edata, eed->head.data, CD_CREASE); if (crease) { @@ -439,7 +439,7 @@ static void v3d_editvertex_buts(uiLayout *layout, View3D *v3d, Object *ob, float } } else { - BM_ITER (eed, &iter, bm, BM_EDGES_OF_MESH, NULL) { + BM_ITER_MESH (eed, &iter, bm, BM_EDGES_OF_MESH) { if (BM_elem_flag_test(eed, BM_ELEM_SELECT) && !BM_elem_flag_test(eed, BM_ELEM_HIDDEN)) { float *crease = (float *)CustomData_bmesh_get(&bm->edata, eed->head.data, CD_CREASE); if (crease) { @@ -456,7 +456,7 @@ static void v3d_editvertex_buts(uiLayout *layout, View3D *v3d, Object *ob, float const float sca = compute_scale_factor(ve_median[6], median[6]); if (ELEM(sca, 0.0f, 1.0f)) { - BM_ITER (eed, &iter, bm, BM_EDGES_OF_MESH, NULL) { + BM_ITER_MESH (eed, &iter, bm, BM_EDGES_OF_MESH) { if (BM_elem_flag_test(eed, BM_ELEM_SELECT)) { float *bweight = (float *)CustomData_bmesh_get(&bm->edata, eed->head.data, CD_BWEIGHT); if (bweight) { @@ -466,7 +466,7 @@ static void v3d_editvertex_buts(uiLayout *layout, View3D *v3d, Object *ob, float } } else if (sca > 0.0f) { - BM_ITER (eed, &iter, bm, BM_EDGES_OF_MESH, NULL) { + BM_ITER_MESH (eed, &iter, bm, BM_EDGES_OF_MESH) { if (BM_elem_flag_test(eed, BM_ELEM_SELECT) && !BM_elem_flag_test(eed, BM_ELEM_HIDDEN)) { float *bweight = (float *)CustomData_bmesh_get(&bm->edata, eed->head.data, CD_BWEIGHT); if (bweight) { @@ -477,7 +477,7 @@ static void v3d_editvertex_buts(uiLayout *layout, View3D *v3d, Object *ob, float } } else { - BM_ITER (eed, &iter, bm, BM_EDGES_OF_MESH, NULL) { + BM_ITER_MESH (eed, &iter, bm, BM_EDGES_OF_MESH) { if (BM_elem_flag_test(eed, BM_ELEM_SELECT) && !BM_elem_flag_test(eed, BM_ELEM_HIDDEN)) { float *bweight = (float *)CustomData_bmesh_get(&bm->edata, eed->head.data, CD_BWEIGHT); if (bweight) { @@ -678,7 +678,7 @@ static void vgroup_copy_active_to_sel(Object *ob) MDeformVert *dvert; int index = 0; - BM_ITER (eve, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { + BM_ITER_MESH (eve, &iter, em->bm, BM_VERTS_OF_MESH) { if (BM_elem_flag_test(eve, BM_ELEM_SELECT) && eve != eve_act) { dvert = CustomData_bmesh_get(&em->bm->vdata, eve->head.data, CD_MDEFORMVERT); if (dvert) { diff --git a/source/blender/editors/space_view3d/view3d_snap.c b/source/blender/editors/space_view3d/view3d_snap.c index 4943d5c5281..6dff792352b 100644 --- a/source/blender/editors/space_view3d/view3d_snap.c +++ b/source/blender/editors/space_view3d/view3d_snap.c @@ -242,7 +242,7 @@ static void make_trans_verts(Object *obedit, float *min, float *max, int mode) // transform now requires awareness for select mode, so we tag the f1 flags in verts tottrans = 0; if (em->selectmode & SCE_SELECT_VERTEX) { - BM_ITER (eve, &iter, bm, BM_VERTS_OF_MESH, NULL) { + BM_ITER_MESH (eve, &iter, bm, BM_VERTS_OF_MESH) { if (!BM_elem_flag_test(eve, BM_ELEM_HIDDEN) && BM_elem_flag_test(eve, BM_ELEM_SELECT)) { BM_elem_index_set(eve, 1); /* set_dirty! */ tottrans++; @@ -253,40 +253,40 @@ static void make_trans_verts(Object *obedit, float *min, float *max, int mode) else if (em->selectmode & SCE_SELECT_EDGE) { BMEdge *eed; - BM_ITER (eve, &iter, bm, BM_VERTS_OF_MESH, NULL) { + BM_ITER_MESH (eve, &iter, bm, BM_VERTS_OF_MESH) { BM_elem_index_set(eve, 0); /* set_dirty! */ } - BM_ITER (eed, &iter, bm, BM_EDGES_OF_MESH, NULL) { + BM_ITER_MESH (eed, &iter, bm, BM_EDGES_OF_MESH) { if (!BM_elem_flag_test(eed, BM_ELEM_HIDDEN) && BM_elem_flag_test(eed, BM_ELEM_SELECT)) { BM_elem_index_set(eed->v1, 1); /* set_dirty! */ BM_elem_index_set(eed->v2, 1); /* set_dirty! */ } } - BM_ITER (eve, &iter, bm, BM_VERTS_OF_MESH, NULL) { + BM_ITER_MESH (eve, &iter, bm, BM_VERTS_OF_MESH) { if (BM_elem_index_get(eve)) tottrans++; } } else { BMFace *efa; - BM_ITER (eve, &iter, bm, BM_VERTS_OF_MESH, NULL) { + BM_ITER_MESH (eve, &iter, bm, BM_VERTS_OF_MESH) { BM_elem_index_set(eve, 0); /* set_dirty! */ } - BM_ITER (efa, &iter, bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, bm, BM_FACES_OF_MESH) { if (!BM_elem_flag_test(efa, BM_ELEM_HIDDEN) && BM_elem_flag_test(efa, BM_ELEM_SELECT)) { BMIter liter; BMLoop *l; - BM_ITER (l, &liter, bm, BM_LOOPS_OF_FACE, efa) { + BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) { BM_elem_index_set(l->v, 1); /* set_dirty! */ } } } - BM_ITER (eve, &iter, bm, BM_VERTS_OF_MESH, NULL) { + BM_ITER_MESH (eve, &iter, bm, BM_VERTS_OF_MESH) { if (BM_elem_index_get(eve)) tottrans++; } } @@ -298,7 +298,7 @@ static void make_trans_verts(Object *obedit, float *min, float *max, int mode) tv = transvmain = MEM_callocN(tottrans * sizeof(TransVert), "maketransverts"); a = 0; - BM_ITER (eve, &iter, bm, BM_VERTS_OF_MESH, NULL) { + BM_ITER_MESH (eve, &iter, bm, BM_VERTS_OF_MESH) { if (BM_elem_index_get(eve)) { BM_elem_index_set(eve, a); /* set_dirty! */ copy_v3_v3(tv->oldloc, eve->co); diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index 7c198cce746..6c254dc4d19 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -4318,7 +4318,7 @@ static BMEdge *get_other_edge(BMesh *bm, BMVert *v, BMEdge *e) BMIter iter; BMEdge *e2; - BM_ITER (e2, &iter, bm, BM_EDGES_OF_VERT, v) { + BM_ITER_ELEM (e2, &iter, v, BM_EDGES_OF_VERT) { if (BM_elem_flag_test(e2, BM_ELEM_SELECT) && e2 != e) return e2; } @@ -4419,10 +4419,10 @@ static int createSlideVerts(TransInfo *t) BLI_smallhash_init(&table); /*ensure valid selection*/ - BM_ITER (v, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { + BM_ITER_MESH (v, &iter, em->bm, BM_VERTS_OF_MESH) { if (BM_elem_flag_test(v, BM_ELEM_SELECT)) { numsel = 0; - BM_ITER (e, &iter2, em->bm, BM_EDGES_OF_VERT, v) { + BM_ITER_ELEM (e, &iter2, v, BM_EDGES_OF_VERT) { if (BM_elem_flag_test(e, BM_ELEM_SELECT)) { /* BMESH_TODO: this is probably very evil, * set v->e to a selected edge*/ @@ -4440,7 +4440,7 @@ static int createSlideVerts(TransInfo *t) } } - BM_ITER (e, &iter, em->bm, BM_EDGES_OF_MESH, NULL) { + BM_ITER_MESH (e, &iter, em->bm, BM_EDGES_OF_MESH) { if (BM_elem_flag_test(e, BM_ELEM_SELECT)) { if (!BM_edge_is_manifold(e)) { MEM_freeN(sld); @@ -4451,7 +4451,7 @@ static int createSlideVerts(TransInfo *t) } j = 0; - BM_ITER (v, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { + BM_ITER_MESH (v, &iter, em->bm, BM_VERTS_OF_MESH) { if (BM_elem_flag_test(v, BM_ELEM_SELECT)) { BM_elem_flag_enable(v, BM_ELEM_TAG); BLI_smallhash_insert(&table, (uintptr_t)v, SET_INT_IN_POINTER(j)); @@ -4473,7 +4473,7 @@ static int createSlideVerts(TransInfo *t) j = 0; while (1) { v = NULL; - BM_ITER (v, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { + BM_ITER_MESH (v, &iter, em->bm, BM_VERTS_OF_MESH) { if (BM_elem_flag_test(v, BM_ELEM_TAG)) break; @@ -4591,7 +4591,7 @@ static int createSlideVerts(TransInfo *t) /* size = 50.0; */ /* UNUSED */ zero_v3(lastvec); zero_v3(dir); /* ee = le = NULL; */ /* UNUSED */ - BM_ITER (e, &iter, em->bm, BM_EDGES_OF_MESH, NULL) { + BM_ITER_MESH (e, &iter, em->bm, BM_EDGES_OF_MESH) { if (BM_elem_flag_test(e, BM_ELEM_SELECT)) { BMIter iter2; BMEdge *e2; @@ -4602,7 +4602,7 @@ static int createSlideVerts(TransInfo *t) dis2 = -1.0f; for (i=0; i<2; i++) { v = i?e->v1:e->v2; - BM_ITER (e2, &iter2, em->bm, BM_EDGES_OF_VERT, v) { + BM_ITER_ELEM (e2, &iter2, v, BM_EDGES_OF_VERT) { if (BM_elem_flag_test(e2, BM_ELEM_SELECT)) continue; @@ -4648,14 +4648,14 @@ static int createSlideVerts(TransInfo *t) BMFace *f; BMLoop *l; - BM_ITER (f, &fiter, em->bm, BM_FACES_OF_VERT, tempsv->v) { + BM_ITER_ELEM (f, &fiter, tempsv->v, BM_FACES_OF_VERT) { if (!BLI_smallhash_haskey(&sld->origfaces, (uintptr_t)f)) { BMFace *copyf = BM_face_copy(em->bm, f, TRUE, TRUE); BM_elem_select_set(em->bm, copyf, FALSE); BM_elem_flag_enable(copyf, BM_ELEM_HIDDEN); - BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_FACE, copyf) { + BM_ITER_ELEM (l, &liter, copyf, BM_LOOPS_OF_FACE) { BM_elem_select_set(em->bm, l->v, FALSE); BM_elem_flag_enable(l->v, BM_ELEM_HIDDEN); BM_elem_select_set(em->bm, l->e, FALSE); @@ -4720,7 +4720,7 @@ void projectSVData(TransInfo *t, int final) BMIter fiter; BMFace *f; - BM_ITER (f, &fiter, em->bm, BM_FACES_OF_VERT, tempsv->v) { + BM_ITER_ELEM (f, &fiter, tempsv->v, BM_FACES_OF_VERT) { BMIter liter2; BMFace *copyf, *copyf2; BMLoop *l2; @@ -4740,7 +4740,7 @@ void projectSVData(TransInfo *t, int final) copyf2 = BLI_smallhash_lookup(&sld->origfaces, (uintptr_t)f); /* project onto copied projection face */ - BM_ITER (l2, &liter2, em->bm, BM_LOOPS_OF_FACE, f) { + BM_ITER_ELEM (l2, &liter2, f, BM_LOOPS_OF_FACE) { copyf = copyf2; if (BM_elem_flag_test(l2->e, BM_ELEM_SELECT) || BM_elem_flag_test(l2->prev->e, BM_ELEM_SELECT)) { diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index ff5ce9af596..2b60ff353d7 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -309,7 +309,7 @@ static void createTransEdge(TransInfo *t) int count=0, countsel=0; int propmode = t->flag & T_PROP_EDIT; - BM_ITER (eed, &iter, em->bm, BM_EDGES_OF_MESH, NULL) { + BM_ITER_MESH (eed, &iter, em->bm, BM_EDGES_OF_MESH) { if (!BM_elem_flag_test(eed, BM_ELEM_HIDDEN)) { if (BM_elem_flag_test(eed, BM_ELEM_SELECT)) countsel++; if (propmode) count++; @@ -331,7 +331,7 @@ static void createTransEdge(TransInfo *t) copy_m3_m4(mtx, t->obedit->obmat); invert_m3_m3(smtx, mtx); - BM_ITER (eed, &iter, em->bm, BM_EDGES_OF_MESH, NULL) { + BM_ITER_MESH (eed, &iter, em->bm, BM_EDGES_OF_MESH) { if (!BM_elem_flag_test(eed, BM_ELEM_HIDDEN) && (BM_elem_flag_test(eed, BM_ELEM_SELECT) || propmode)) { float *bweight = CustomData_bmesh_get(&em->bm->edata, eed->head.data, CD_BWEIGHT); float *crease = CustomData_bmesh_get(&em->bm->edata, eed->head.data, CD_CREASE); @@ -1888,7 +1888,7 @@ static void editmesh_set_connectivity_distance(BMEditMesh *em, float mtx[][3], f BLI_smallhash_init(visit); - BM_ITER (v, &viter, em->bm, BM_VERTS_OF_MESH, NULL) { + BM_ITER_MESH (v, &viter, em->bm, BM_VERTS_OF_MESH) { if (BM_elem_flag_test(v, BM_ELEM_SELECT)==0 || BM_elem_flag_test(v, BM_ELEM_HIDDEN)) continue; @@ -1909,7 +1909,7 @@ static void editmesh_set_connectivity_distance(BMEditMesh *em, float mtx[][3], f v2 = queue[start]; d = dqueue[start]; - BM_ITER (e, &eiter, em->bm, BM_EDGES_OF_VERT, v2) { + BM_ITER_ELEM (e, &eiter, v2, BM_EDGES_OF_VERT) { float d2; v3 = BM_edge_other_vert(e, v2); @@ -1959,7 +1959,7 @@ static void editmesh_set_connectivity_distance(BMEditMesh *em, float mtx[][3], f BMFace *efa; BMIter iter; - BM_ITER (efa, &iter, bm, BM_FACES_OF_VERT, eve) { + BM_ITER_ELEM (efa, &iter, eve, BM_FACES_OF_VERT) { if (BM_elem_flag_test(efa, BM_ELEM_SELECT)) { BM_face_center_mean_calc(bm, efa, cent_r); break; @@ -1972,7 +1972,7 @@ static void get_edge_center(float cent_r[3], BMesh *bm, BMVert *eve) BMEdge *eed; BMIter iter; - BM_ITER (eed, &iter, bm, BM_EDGES_OF_VERT, eve) { + BM_ITER_ELEM (eed, &iter, eve, BM_EDGES_OF_VERT) { if (BM_elem_flag_test(eed, BM_ELEM_SELECT)) { mid_v3_v3v3(cent_r, eed->v1->co, eed->v2->co); break; @@ -2051,7 +2051,7 @@ static void createTransEditVerts(bContext *C, TransInfo *t) // transform now requires awareness for select mode, so we tag the f1 flags in verts if (selectmode & SCE_SELECT_VERTEX) { - BM_ITER (eve, &iter, bm, BM_VERTS_OF_MESH, NULL) { + BM_ITER_MESH (eve, &iter, bm, BM_VERTS_OF_MESH) { BM_elem_flag_set(eve, BM_ELEM_TAG, BM_elem_flag_test(eve, BM_ELEM_SELECT)); } } @@ -2452,7 +2452,7 @@ static void createTransUVs(bContext *C, TransInfo *t) if (!ED_space_image_show_uvedit(sima, t->obedit)) return; /* count */ - BM_ITER (efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { tf= CustomData_bmesh_get(&em->bm->pdata, efa->head.data, CD_MTEXPOLY); if (!uvedit_face_visible(scene, ima, efa, tf)) { @@ -2461,7 +2461,7 @@ static void createTransUVs(bContext *C, TransInfo *t) } BM_elem_flag_enable(efa, BM_ELEM_TAG); - BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { + BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) { if (uvedit_uv_selected(em, scene, l)) countsel++; @@ -2485,11 +2485,11 @@ static void createTransUVs(bContext *C, TransInfo *t) td= t->data; td2d= t->data2d; - BM_ITER (efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { if (!BM_elem_flag_test(efa, BM_ELEM_TAG)) continue; - BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { + BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) { if (!propmode && !uvedit_uv_selected(em, scene, l)) continue; diff --git a/source/blender/editors/transform/transform_manipulator.c b/source/blender/editors/transform/transform_manipulator.c index 4d7c1338f30..180c631d39a 100644 --- a/source/blender/editors/transform/transform_manipulator.c +++ b/source/blender/editors/transform/transform_manipulator.c @@ -315,7 +315,7 @@ int calc_manipulator_stats(const bContext *C) * mode. note we can't use just vertex selection flag because * it is not flush down on changes */ if (ts->selectmode & SCE_SELECT_VERTEX) { - BM_ITER (eve, &iter, bm, BM_VERTS_OF_MESH, NULL) { + BM_ITER_MESH (eve, &iter, bm, BM_VERTS_OF_MESH) { if (!BM_elem_flag_test(eve, BM_ELEM_HIDDEN)) { if (BM_elem_flag_test(eve, BM_ELEM_SELECT)) { totsel++; @@ -327,10 +327,10 @@ int calc_manipulator_stats(const bContext *C) else if (ts->selectmode & SCE_SELECT_EDGE) { BMIter itersub; BMEdge *eed; - BM_ITER (eve, &iter, bm, BM_VERTS_OF_MESH, NULL) { + BM_ITER_MESH (eve, &iter, bm, BM_VERTS_OF_MESH) { if (!BM_elem_flag_test(eve, BM_ELEM_HIDDEN)) { /* check the vertex has a selected edge, only add it once */ - BM_ITER (eed, &itersub, bm, BM_EDGES_OF_VERT, eve) { + BM_ITER_ELEM (eed, &itersub, eve, BM_EDGES_OF_VERT) { if (BM_elem_flag_test(eed, BM_ELEM_SELECT)) { totsel++; calc_tw_center(scene, eve->co); @@ -343,10 +343,10 @@ int calc_manipulator_stats(const bContext *C) else { BMIter itersub; BMFace *efa; - BM_ITER (eve, &iter, bm, BM_VERTS_OF_MESH, NULL) { + BM_ITER_MESH (eve, &iter, bm, BM_VERTS_OF_MESH) { if (!BM_elem_flag_test(eve, BM_ELEM_HIDDEN)) { /* check the vertex has a selected face, only add it once */ - BM_ITER (efa, &itersub, bm, BM_FACES_OF_VERT, eve) { + BM_ITER_ELEM (efa, &itersub, eve, BM_FACES_OF_VERT) { if (BM_elem_flag_test(efa, BM_ELEM_SELECT)) { totsel++; calc_tw_center(scene, eve->co); diff --git a/source/blender/editors/transform/transform_orientations.c b/source/blender/editors/transform/transform_orientations.c index 968b3fd6993..2cc9d8fca93 100644 --- a/source/blender/editors/transform/transform_orientations.c +++ b/source/blender/editors/transform/transform_orientations.c @@ -599,7 +599,7 @@ int getTransformOrientation(const bContext *C, float normal[3], float plane[3], BMFace *efa; BMIter iter; - BM_ITER (efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { if (BM_elem_flag_test(efa, BM_ELEM_SELECT)) { add_v3_v3(normal, efa->no); sub_v3_v3v3(vec, @@ -616,7 +616,7 @@ int getTransformOrientation(const bContext *C, float normal[3], float plane[3], BMIter iter; float cotangent[3]; - BM_ITER (eve, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { + BM_ITER_MESH (eve, &iter, em->bm, BM_VERTS_OF_MESH) { if (BM_elem_flag_test(eve, BM_ELEM_SELECT)) { if (v1 == NULL) { v1 = eve; @@ -640,7 +640,7 @@ int getTransformOrientation(const bContext *C, float normal[3], float plane[3], BMEdge *eed = NULL; BMIter iter; - BM_ITER (eed, &iter, em->bm, BM_EDGES_OF_MESH, NULL) { + BM_ITER_MESH (eed, &iter, em->bm, BM_EDGES_OF_MESH) { if (BM_elem_flag_test(eed, BM_ELEM_SELECT)) { sub_v3_v3v3(plane, eed->v2->co, eed->v1->co); break; @@ -654,7 +654,7 @@ int getTransformOrientation(const bContext *C, float normal[3], float plane[3], BMEdge *eed = NULL; BMIter iter; - BM_ITER (eed, &iter, em->bm, BM_EDGES_OF_MESH, NULL) { + BM_ITER_MESH (eed, &iter, em->bm, BM_EDGES_OF_MESH) { if (BM_elem_flag_test(eed, BM_ELEM_SELECT)) { /* use average vert normals as plane and edge vector as normal */ copy_v3_v3(plane, eed->v1->no); @@ -669,7 +669,7 @@ int getTransformOrientation(const bContext *C, float normal[3], float plane[3], BMVert *v1 = NULL, *v2 = NULL; BMIter iter; - BM_ITER (eve, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { + BM_ITER_MESH (eve, &iter, em->bm, BM_VERTS_OF_MESH) { if (BM_elem_flag_test(eve, BM_ELEM_SELECT)) { if (v1 == NULL) { v1 = eve; @@ -689,7 +689,7 @@ int getTransformOrientation(const bContext *C, float normal[3], float plane[3], else if (em->bm->totvertsel == 1) { BMIter iter; - BM_ITER (eve, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { + BM_ITER_MESH (eve, &iter, em->bm, BM_VERTS_OF_MESH) { if (BM_elem_flag_test(eve, BM_ELEM_SELECT)) { copy_v3_v3(normal, eve->no); break; @@ -702,7 +702,7 @@ int getTransformOrientation(const bContext *C, float normal[3], float plane[3], zero_v3(normal); - BM_ITER (eve, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { + BM_ITER_MESH (eve, &iter, em->bm, BM_VERTS_OF_MESH) { if (BM_elem_flag_test(eve, BM_ELEM_SELECT)) { add_v3_v3(normal, eve->no); } diff --git a/source/blender/editors/util/crazyspace.c b/source/blender/editors/util/crazyspace.c index ee80fe92983..4b03c846f3e 100644 --- a/source/blender/editors/util/crazyspace.c +++ b/source/blender/editors/util/crazyspace.c @@ -149,11 +149,11 @@ void crazyspace_set_quats_editmesh(BMEditMesh *em, float *origcos, float *mapped BM_mesh_elem_index_ensure(em->bm, BM_VERT); - BM_ITER (v, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { + BM_ITER_MESH (v, &iter, em->bm, BM_VERTS_OF_MESH) { if (!BM_elem_flag_test(v, BM_ELEM_SELECT) || BM_elem_flag_test(v, BM_ELEM_HIDDEN)) continue; - BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_VERT, v) { + BM_ITER_ELEM (l, &liter, v, BM_LOOPS_OF_VERT) { BMLoop *l2 = BM_face_other_edge_loop(l->f, l->e, v); /* retrieve mapped coordinates */ @@ -176,7 +176,7 @@ void crazyspace_set_quats_editmesh(BMEditMesh *em, float *origcos, float *mapped } index = 0; - BM_ITER (v, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { + BM_ITER_MESH (v, &iter, em->bm, BM_VERTS_OF_MESH) { if (vert_table[index] != 0) BM_elem_index_set(v, vert_table[index] - 1); /* set_dirty! */ else diff --git a/source/blender/editors/uvedit/uvedit_buttons.c b/source/blender/editors/uvedit/uvedit_buttons.c index 586d714e5f7..394b8952a13 100644 --- a/source/blender/editors/uvedit/uvedit_buttons.c +++ b/source/blender/editors/uvedit/uvedit_buttons.c @@ -72,12 +72,12 @@ static int uvedit_center(Scene *scene, BMEditMesh *em, Image *ima, float center[ int tot = 0.0; zero_v2(center); - BM_ITER (f, &iter, em->bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (f, &iter, em->bm, BM_FACES_OF_MESH) { tf = CustomData_bmesh_get(&em->bm->pdata, f->head.data, CD_MTEXPOLY); if (!uvedit_face_visible(scene, ima, f, tf)) continue; - BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_FACE, f) { + BM_ITER_ELEM (l, &liter, f, BM_LOOPS_OF_FACE) { luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); if (uvedit_uv_selected(em, scene, l)) { add_v2_v2(center, luv->uv); @@ -101,8 +101,8 @@ static void uvedit_translate(Scene *scene, BMEditMesh *em, Image *UNUSED(ima), f BMIter iter, liter; MLoopUV *luv; - BM_ITER (f, &iter, em->bm, BM_FACES_OF_MESH, NULL) { - BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_FACE, f) { + BM_ITER_MESH (f, &iter, em->bm, BM_FACES_OF_MESH) { + BM_ITER_ELEM (l, &liter, f, BM_LOOPS_OF_FACE) { luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); if (uvedit_uv_selected(em, scene, l)) { add_v2_v2(luv->uv, delta); diff --git a/source/blender/editors/uvedit/uvedit_draw.c b/source/blender/editors/uvedit/uvedit_draw.c index befdce301f2..4bcfcdc76f1 100644 --- a/source/blender/editors/uvedit/uvedit_draw.c +++ b/source/blender/editors/uvedit/uvedit_draw.c @@ -136,9 +136,9 @@ static void draw_uvs_shadow(Object *obedit) /* draws the grey mesh when painting */ glColor3ub(112, 112, 112); - BM_ITER (efa, &iter, bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, bm, BM_FACES_OF_MESH) { glBegin(GL_LINE_LOOP); - BM_ITER (l, &liter, bm, BM_LOOPS_OF_FACE, efa) { + BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) { luv = CustomData_bmesh_get(&bm->ldata, l->head.data, CD_MLOOPUV); glVertex2fv(luv->uv); @@ -181,7 +181,7 @@ static void draw_uvs_stretch(SpaceImage *sima, Scene *scene, BMEditMesh *em, MTe { float totarea = 0.0f, totuvarea = 0.0f, areadiff, uvarea, area; - BM_ITER (efa, &iter, bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, bm, BM_FACES_OF_MESH) { tf = CustomData_bmesh_get(&bm->pdata, efa->head.data, CD_MTEXPOLY); BLI_array_empty(tf_uv); @@ -190,7 +190,7 @@ static void draw_uvs_stretch(SpaceImage *sima, Scene *scene, BMEditMesh *em, MTe BLI_array_growitems(tf_uvorig, efa->len); i = 0; - BM_ITER (l, &liter, bm, BM_LOOPS_OF_FACE, efa) { + BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) { luv = CustomData_bmesh_get(&bm->ldata, l->head.data, CD_MLOOPUV); copy_v2_v2(tf_uvorig[i], luv->uv); @@ -218,10 +218,10 @@ static void draw_uvs_stretch(SpaceImage *sima, Scene *scene, BMEditMesh *em, MTe col[0] = 1.0; col[1] = col[2] = 0.0; glColor3fv(col); - BM_ITER (efa, &iter, bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, bm, BM_FACES_OF_MESH) { if (BM_elem_flag_test(efa, BM_ELEM_TAG)) { glBegin(GL_POLYGON); - BM_ITER (l, &liter, bm, BM_LOOPS_OF_FACE, efa) { + BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) { luv = CustomData_bmesh_get(&bm->ldata, l->head.data, CD_MLOOPUV); glVertex2fv(luv->uv); } @@ -230,7 +230,7 @@ static void draw_uvs_stretch(SpaceImage *sima, Scene *scene, BMEditMesh *em, MTe } } else { - BM_ITER (efa, &iter, bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, bm, BM_FACES_OF_MESH) { if (BM_elem_flag_test(efa, BM_ELEM_TAG)) { area = BM_face_area_calc(bm, efa) / totarea; @@ -240,7 +240,7 @@ static void draw_uvs_stretch(SpaceImage *sima, Scene *scene, BMEditMesh *em, MTe BLI_array_growitems(tf_uvorig, efa->len); i = 0; - BM_ITER (l, &liter, bm, BM_LOOPS_OF_FACE, efa) { + BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) { luv = CustomData_bmesh_get(&bm->ldata, l->head.data, CD_MLOOPUV); copy_v2_v2(tf_uvorig[i], luv->uv); @@ -264,7 +264,7 @@ static void draw_uvs_stretch(SpaceImage *sima, Scene *scene, BMEditMesh *em, MTe glColor3fv(col); glBegin(GL_POLYGON); - BM_ITER (l, &liter, bm, BM_LOOPS_OF_FACE, efa) { + BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) { luv = CustomData_bmesh_get(&bm->ldata, l->head.data, CD_MLOOPUV); glVertex2fv(luv->uv); } @@ -291,7 +291,7 @@ static void draw_uvs_stretch(SpaceImage *sima, Scene *scene, BMEditMesh *em, MTe glShadeModel(GL_SMOOTH); - BM_ITER (efa, &iter, bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, bm, BM_FACES_OF_MESH) { tf = CustomData_bmesh_get(&bm->pdata, efa->head.data, CD_MTEXPOLY); if (uvedit_face_visible(scene, ima, efa, tf)) { @@ -310,7 +310,7 @@ static void draw_uvs_stretch(SpaceImage *sima, Scene *scene, BMEditMesh *em, MTe BLI_array_growitems(av, nverts); BLI_array_growitems(auv, nverts); - BM_ITER_INDEX (l, &liter, bm, BM_LOOPS_OF_FACE, efa, i) { + BM_ITER_ELEM_INDEX (l, &liter, efa, BM_LOOPS_OF_FACE, i) { luv = CustomData_bmesh_get(&bm->ldata, l->head.data, CD_MLOOPUV); copy_v2_v2(tf_uvorig[i], luv->uv); } @@ -318,7 +318,7 @@ static void draw_uvs_stretch(SpaceImage *sima, Scene *scene, BMEditMesh *em, MTe poly_copy_aspect(tf_uvorig, tf_uv, aspx, aspy, nverts); j = nverts - 1; - BM_ITER_INDEX (l, &liter, bm, BM_LOOPS_OF_FACE, efa, i) { + BM_ITER_ELEM_INDEX (l, &liter, efa, BM_LOOPS_OF_FACE, i) { sub_v2_v2v2(auv[i], tf_uv[j], tf_uv[i]); normalize_v2(auv[i]); sub_v3_v3v3(av[i], l->prev->v->co, l->v->co); normalize_v3(av[i]); j = i; @@ -336,7 +336,7 @@ static void draw_uvs_stretch(SpaceImage *sima, Scene *scene, BMEditMesh *em, MTe } glBegin(GL_POLYGON); - BM_ITER_INDEX (l, &liter, bm, BM_LOOPS_OF_FACE, efa, i) { + BM_ITER_ELEM_INDEX (l, &liter, efa, BM_LOOPS_OF_FACE, i) { luv = CustomData_bmesh_get(&bm->ldata, l->head.data, CD_MLOOPUV); a = fabsf(uvang[i] - ang[i]) / (float)M_PI; weight_to_rgb(col, 1.0f - powf((1.0f - a), 2.0f)); @@ -503,7 +503,7 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, Object *obedit) glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); glEnable(GL_BLEND); - BM_ITER (efa, &iter, bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, bm, BM_FACES_OF_MESH) { tf = CustomData_bmesh_get(&bm->pdata, efa->head.data, CD_MTEXPOLY); if (uvedit_face_visible(scene, ima, efa, tf)) { @@ -516,7 +516,7 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, Object *obedit) glColor4ubv((GLubyte *)col1); glBegin(GL_POLYGON); - BM_ITER (l, &liter, bm, BM_LOOPS_OF_FACE, efa) { + BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) { luv = CustomData_bmesh_get(&bm->ldata, l->head.data, CD_MLOOPUV); glVertex2fv(luv->uv); } @@ -533,7 +533,7 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, Object *obedit) else { /* would be nice to do this within a draw loop but most below are optional, so it would involve too many checks */ - BM_ITER (efa, &iter, bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, bm, BM_FACES_OF_MESH) { tf = CustomData_bmesh_get(&bm->pdata, efa->head.data, CD_MTEXPOLY); if (uvedit_face_visible(scene, ima, efa, tf)) { @@ -561,7 +561,7 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, Object *obedit) glPolygonStipple(stipple_quarttone); glBegin(GL_POLYGON); - BM_ITER (l, &liter, bm, BM_LOOPS_OF_FACE, activef) { + BM_ITER_ELEM (l, &liter, activef, BM_LOOPS_OF_FACE) { luv = CustomData_bmesh_get(&bm->ldata, l->head.data, CD_MLOOPUV); glVertex2fv(luv->uv); } @@ -582,7 +582,7 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, Object *obedit) switch (sima->dt_uv) { case SI_UVDT_DASH: - BM_ITER (efa, &iter, bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, bm, BM_FACES_OF_MESH) { if (!BM_elem_flag_test(efa, BM_ELEM_TAG)) continue; tf = CustomData_bmesh_get(&bm->pdata, efa->head.data, CD_MTEXPOLY); @@ -591,7 +591,7 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, Object *obedit) cpack(0x111111); glBegin(GL_LINE_LOOP); - BM_ITER (l, &liter, bm, BM_LOOPS_OF_FACE, efa) { + BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) { luv = CustomData_bmesh_get(&bm->ldata, l->head.data, CD_MLOOPUV); glVertex2fv(luv->uv); } @@ -601,7 +601,7 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, Object *obedit) cpack(0x909090); glBegin(GL_LINE_LOOP); - BM_ITER (l, &liter, bm, BM_LOOPS_OF_FACE, efa) { + BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) { luv = CustomData_bmesh_get(&bm->ldata, l->head.data, CD_MLOOPUV); glVertex2fv(luv->uv); } @@ -625,12 +625,12 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, Object *obedit) if (sima->dt_uv == SI_UVDT_WHITE) glColor3f(1.0f, 1.0f, 1.0f); else glColor3f(0.0f, 0.0f, 0.0f); - BM_ITER (efa, &iter, bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, bm, BM_FACES_OF_MESH) { if (!BM_elem_flag_test(efa, BM_ELEM_TAG)) continue; glBegin(GL_LINE_LOOP); - BM_ITER (l, &liter, bm, BM_LOOPS_OF_FACE, efa) { + BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) { luv = CustomData_bmesh_get(&bm->ldata, l->head.data, CD_MLOOPUV); glVertex2fv(luv->uv); } @@ -641,12 +641,12 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, Object *obedit) glLineWidth(3); cpack(0x0); - BM_ITER (efa, &iter, bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, bm, BM_FACES_OF_MESH) { if (!BM_elem_flag_test(efa, BM_ELEM_TAG)) continue; glBegin(GL_LINE_LOOP); - BM_ITER (l, &liter, bm, BM_LOOPS_OF_FACE, efa) { + BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) { luv = CustomData_bmesh_get(&bm->ldata, l->head.data, CD_MLOOPUV); glVertex2fv(luv->uv); } @@ -664,12 +664,12 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, Object *obedit) if (interpedges) { glShadeModel(GL_SMOOTH); - BM_ITER (efa, &iter, bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, bm, BM_FACES_OF_MESH) { if (!BM_elem_flag_test(efa, BM_ELEM_TAG)) continue; glBegin(GL_LINE_LOOP); - BM_ITER (l, &liter, bm, BM_LOOPS_OF_FACE, efa) { + BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) { sel = (uvedit_uv_selected(em, scene, l) ? 1 : 0); glColor4ubv(sel ? (GLubyte *)col1 : (GLubyte *)col2); @@ -682,12 +682,12 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, Object *obedit) glShadeModel(GL_FLAT); } else { - BM_ITER (efa, &iter, bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, bm, BM_FACES_OF_MESH) { if (!BM_elem_flag_test(efa, BM_ELEM_TAG)) continue; glBegin(GL_LINES); - BM_ITER (l, &liter, bm, BM_LOOPS_OF_FACE, efa) { + BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) { sel = (uvedit_edge_selected(em, scene, l) ? 1 : 0); if (sel != lastsel) { glColor4ubv(sel ? (GLubyte *)col1 : (GLubyte *)col2); @@ -704,12 +704,12 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, Object *obedit) } else { /* no nice edges */ - BM_ITER (efa, &iter, bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, bm, BM_FACES_OF_MESH) { if (!BM_elem_flag_test(efa, BM_ELEM_TAG)) continue; glBegin(GL_LINE_LOOP); - BM_ITER (l, &liter, bm, BM_LOOPS_OF_FACE, efa) { + BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) { luv = CustomData_bmesh_get(&bm->ldata, l->head.data, CD_MLOOPUV); glVertex2fv(luv->uv); } @@ -737,7 +737,7 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, Object *obedit) UI_ThemeColor(TH_WIRE); bglBegin(GL_POINTS); - BM_ITER (efa, &iter, bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, bm, BM_FACES_OF_MESH) { if (!BM_elem_flag_test(efa, BM_ELEM_TAG)) continue; @@ -752,7 +752,7 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, Object *obedit) UI_ThemeColor(TH_FACE_DOT); bglBegin(GL_POINTS); - BM_ITER (efa, &iter, bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, bm, BM_FACES_OF_MESH) { if (!BM_elem_flag_test(efa, BM_ELEM_TAG)) continue; @@ -773,11 +773,11 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, Object *obedit) glPointSize(pointsize); bglBegin(GL_POINTS); - BM_ITER (efa, &iter, bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, bm, BM_FACES_OF_MESH) { if (!BM_elem_flag_test(efa, BM_ELEM_TAG)) continue; - BM_ITER (l, &liter, bm, BM_LOOPS_OF_FACE, efa) { + BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) { luv = CustomData_bmesh_get(&bm->ldata, l->head.data, CD_MLOOPUV); if (!uvedit_uv_selected(em, scene, l)) bglVertex2fv(luv->uv); @@ -791,11 +791,11 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, Object *obedit) cpack(0xFF); bglBegin(GL_POINTS); - BM_ITER (efa, &iter, bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, bm, BM_FACES_OF_MESH) { if (!BM_elem_flag_test(efa, BM_ELEM_TAG)) continue; - BM_ITER (l, &liter, bm, BM_LOOPS_OF_FACE, efa) { + BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) { luv = CustomData_bmesh_get(&bm->ldata, l->head.data, CD_MLOOPUV); if (luv->flag & MLOOPUV_PINNED) @@ -809,11 +809,11 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, Object *obedit) glPointSize(pointsize); bglBegin(GL_POINTS); - BM_ITER (efa, &iter, bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, bm, BM_FACES_OF_MESH) { if (!BM_elem_flag_test(efa, BM_ELEM_TAG)) continue; - BM_ITER (l, &liter, bm, BM_LOOPS_OF_FACE, efa) { + BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) { luv = CustomData_bmesh_get(&bm->ldata, l->head.data, CD_MLOOPUV); if (uvedit_uv_selected(em, scene, l)) diff --git a/source/blender/editors/uvedit/uvedit_ops.c b/source/blender/editors/uvedit/uvedit_ops.c index 4e3a7540261..006b2fcf564 100644 --- a/source/blender/editors/uvedit/uvedit_ops.c +++ b/source/blender/editors/uvedit/uvedit_ops.c @@ -204,7 +204,7 @@ void ED_uvedit_assign_image(Main *bmain, Scene *scene, Object *obedit, Image *im } /* now assign to all visible faces */ - BM_ITER (efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { tf = CustomData_bmesh_get(&em->bm->pdata, efa->head.data, CD_MTEXPOLY); if (uvedit_face_visible(scene, previma, efa, tf)) { @@ -251,7 +251,7 @@ static int uvedit_set_tile(Object *obedit, Image *ima, int curtile) em = BMEdit_FromObject(obedit); - BM_ITER (efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { tf = CustomData_bmesh_get(&em->bm->pdata, efa->head.data, CD_MTEXPOLY); if (!BM_elem_flag_test(efa, BM_ELEM_HIDDEN) && BM_elem_flag_test(efa, BM_ELEM_SELECT)) @@ -314,7 +314,7 @@ int uvedit_face_selected(Scene *scene, BMEditMesh *em, BMFace *efa) MLoopUV *luv; BMIter liter; - BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { + BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) { luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); if (!(luv->flag & MLOOPUV_VERTSEL)) return 0; @@ -335,7 +335,7 @@ int uvedit_face_select(Scene *scene, BMEditMesh *em, BMFace *efa) MLoopUV *luv; BMIter liter; - BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { + BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) { luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); luv->flag |= MLOOPUV_VERTSEL; } @@ -358,7 +358,7 @@ int uvedit_face_deselect(Scene *scene, BMEditMesh *em, BMFace *efa) MLoopUV *luv; BMIter liter; - BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { + BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) { luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); luv->flag &= ~MLOOPUV_VERTSEL; } @@ -518,7 +518,7 @@ void poly_uv_center(BMEditMesh *em, BMFace *f, float cent[2]) zero_v2(cent); - BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_FACE, f) { + BM_ITER_ELEM (l, &liter, f, BM_LOOPS_OF_FACE) { luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); add_v2_v2(cent, luv->uv); } @@ -597,12 +597,12 @@ int ED_uvedit_minmax(Scene *scene, Image *ima, Object *obedit, float *min, float INIT_MINMAX2(min, max); sel = 0; - BM_ITER (efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { tf = CustomData_bmesh_get(&em->bm->pdata, efa->head.data, CD_MTEXPOLY); if (!uvedit_face_visible(scene, ima, efa, tf)) continue; - BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { + BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) { if (uvedit_uv_selected(em, scene, l)) { luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); DO_MINMAX2(luv->uv, min, max); @@ -625,12 +625,12 @@ static int ED_uvedit_median(Scene *scene, Image *ima, Object *obedit, float co[2 unsigned int sel = 0; zero_v2(co); - BM_ITER (efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { tf = CustomData_bmesh_get(&em->bm->pdata, efa->head.data, CD_MTEXPOLY); if (!uvedit_face_visible(scene, ima, efa, tf)) continue; - BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { + BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) { luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); if (uvedit_uv_selected(em, scene, l)) { add_v2_v2(co, luv->uv); @@ -681,13 +681,13 @@ void uv_find_nearest_edge(Scene *scene, Image *ima, BMEditMesh *em, float co[2], BM_mesh_elem_index_ensure(em->bm, BM_VERT); - BM_ITER (efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { tf = CustomData_bmesh_get(&em->bm->pdata, efa->head.data, CD_MTEXPOLY); if (!uvedit_face_visible(scene, ima, efa, tf)) continue; i = 0; - BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { + BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) { luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); nextluv = CustomData_bmesh_get(&em->bm->ldata, l->next->head.data, CD_MLOOPUV); @@ -730,13 +730,13 @@ static void find_nearest_uv_face(Scene *scene, Image *ima, BMEditMesh *em, float hit->l = hit->nextl = NULL; hit->luv = hit->nextluv = NULL; - BM_ITER (efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { tf = CustomData_bmesh_get(&em->bm->pdata, efa->head.data, CD_MTEXPOLY); if (!uvedit_face_visible(scene, ima, efa, tf)) continue; cent[0] = cent[1] = 0.0f; - BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { + BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) { luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); add_v2_v2(cent, luv->uv); @@ -770,7 +770,7 @@ static int nearest_uv_between(BMEditMesh *em, BMFace *efa, int UNUSED(nverts), i m[1] = co[1] - uv[1]; i = 0; - BM_ITER (l, &iter, em->bm, BM_LOOPS_OF_FACE, efa) { + BM_ITER_ELEM (l, &iter, efa, BM_LOOPS_OF_FACE) { luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); if (i == id1) @@ -821,13 +821,13 @@ void uv_find_nearest_vert(Scene *scene, Image *ima, BMEditMesh *em, BM_mesh_elem_index_ensure(em->bm, BM_VERT); - BM_ITER (efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { tf = CustomData_bmesh_get(&em->bm->pdata, efa->head.data, CD_MTEXPOLY); if (!uvedit_face_visible(scene, ima, efa, tf)) continue; i = 0; - BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { + BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) { luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); if (penalty && uvedit_uv_selected(em, scene, l)) @@ -874,12 +874,12 @@ int ED_uvedit_nearest_uv(Scene *scene, Object *obedit, Image *ima, float co[2], uv[0] = co[0]; uv[1] = co[1]; - BM_ITER (efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { tf = CustomData_bmesh_get(&em->bm->pdata, efa->head.data, CD_MTEXPOLY); if (!uvedit_face_visible(scene, ima, efa, tf)) continue; - BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { + BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) { luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); dist = fabs(co[0] - luv->uv[0]) + fabs(co[1] - luv->uv[1]); @@ -1014,7 +1014,7 @@ static int select_edgeloop(Scene *scene, Image *ima, BMEditMesh *em, NearestHit BM_mesh_elem_index_ensure(em->bm, BM_VERT); count = 0; - BM_ITER (efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { if (!extend) { uvedit_face_deselect(scene, em, efa); } @@ -1047,7 +1047,7 @@ static int select_edgeloop(Scene *scene, Image *ima, BMEditMesh *em, NearestHit /* find correct valence edges which are not tagged yet, but connect to tagged one */ - BM_ITER (efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { tf = CustomData_bmesh_get(&em->bm->pdata, efa->head.data, CD_MTEXPOLY); if (!BMO_elem_flag_test(em->bm, efa, EFA_F1_FLAG) && uvedit_face_visible(scene, ima, efa, tf)) { @@ -1092,9 +1092,9 @@ static int select_edgeloop(Scene *scene, Image *ima, BMEditMesh *em, NearestHit else select = 1; - BM_ITER (efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { a = 0; - BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { + BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) { iterv1 = uv_vertex_map_get(vmap, efa, a); if (iterv1->flag) { @@ -1138,11 +1138,11 @@ static void select_linked(Scene *scene, Image *ima, BMEditMesh *em, float limit[ flag = MEM_callocN(sizeof(*flag) * em->bm->totface, "UvLinkFlag"); if (!hit) { - BM_ITER_INDEX (efa, &iter, em->bm, BM_FACES_OF_MESH, NULL, a) { + BM_ITER_MESH_INDEX (efa, &iter, em->bm, BM_FACES_OF_MESH, a) { tf = CustomData_bmesh_get(&em->bm->pdata, efa->head.data, CD_MTEXPOLY); if (uvedit_face_visible(scene, ima, efa, tf)) { - BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { + BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) { luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); if (luv->flag & MLOOPUV_VERTSEL) { @@ -1158,7 +1158,7 @@ static void select_linked(Scene *scene, Image *ima, BMEditMesh *em, float limit[ } else { a = 0; - BM_ITER (efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { if (efa == hit->efa) { stack[stacksize] = a; stacksize++; @@ -1177,7 +1177,7 @@ static void select_linked(Scene *scene, Image *ima, BMEditMesh *em, float limit[ a = stack[stacksize]; j = 0; - BM_ITER (efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { if (j == a) break; @@ -1185,7 +1185,7 @@ static void select_linked(Scene *scene, Image *ima, BMEditMesh *em, float limit[ } i = 0; - BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { + BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) { /* make_uv_vert_map_EM sets verts tmp.l to the indices */ vlist = EDBM_uv_vert_map_at_index(vmap, BM_elem_index_get(l->v)); @@ -1215,8 +1215,8 @@ static void select_linked(Scene *scene, Image *ima, BMEditMesh *em, float limit[ if (!extend) { a = 0; - BM_ITER (efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { - BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { + BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { + BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) { luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); if (flag[a]) @@ -1229,13 +1229,13 @@ static void select_linked(Scene *scene, Image *ima, BMEditMesh *em, float limit[ } else { a = 0; - BM_ITER (efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { if (!flag[a]) { a++; continue; } - BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { + BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) { luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); if (luv->flag & MLOOPUV_VERTSEL) @@ -1250,13 +1250,13 @@ static void select_linked(Scene *scene, Image *ima, BMEditMesh *em, float limit[ if (efa) { a = 0; - BM_ITER (efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { if (!flag[a]) { a++; continue; } - BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { + BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) { luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); luv->flag &= ~MLOOPUV_VERTSEL; @@ -1267,13 +1267,13 @@ static void select_linked(Scene *scene, Image *ima, BMEditMesh *em, float limit[ } else { a = 0; - BM_ITER (efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { if (!flag[a]) { a++; continue; } - BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { + BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) { luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); luv->flag |= MLOOPUV_VERTSEL; @@ -1297,7 +1297,7 @@ static float *uv_sel_co_from_eve(Scene *scene, Image *ima, BMEditMesh *em, BMVer BMIter liter; BMLoop *l; - BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_VERT, eve) { + BM_ITER_ELEM (l, &liter, eve, BM_LOOPS_OF_VERT) { MTexPoly *tf = CustomData_bmesh_get(&em->bm->pdata, l->f->head.data, CD_MTEXPOLY); if (!uvedit_face_visible(scene, ima, l->f, tf)) @@ -1338,13 +1338,13 @@ static void weld_align_uv(bContext *C, int tool) BMFace *efa; BMLoop *l; - BM_ITER (efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { tf = CustomData_bmesh_get(&em->bm->pdata, efa->head.data, CD_MTEXPOLY); if (!uvedit_face_visible(scene, ima, efa, tf)) continue; - BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { + BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) { if (uvedit_uv_selected(em, scene, l)) { luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); DO_MINMAX2(luv->uv, min, max); @@ -1361,12 +1361,12 @@ static void weld_align_uv(bContext *C, int tool) BMFace *efa; BMLoop *l; - BM_ITER (efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { tf = CustomData_bmesh_get(&em->bm->pdata, efa->head.data, CD_MTEXPOLY); if (!uvedit_face_visible(scene, ima, efa, tf)) continue; - BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { + BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) { if (uvedit_uv_selected(em, scene, l)) { luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); luv->uv[0] = cent[0]; @@ -1380,12 +1380,12 @@ static void weld_align_uv(bContext *C, int tool) BMFace *efa; BMLoop *l; - BM_ITER (efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { tf = CustomData_bmesh_get(&em->bm->pdata, efa->head.data, CD_MTEXPOLY); if (!uvedit_face_visible(scene, ima, efa, tf)) continue; - BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { + BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) { if (uvedit_uv_selected(em, scene, l)) { luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); luv->uv[1] = cent[1]; @@ -1403,13 +1403,13 @@ static void weld_align_uv(bContext *C, int tool) BMIter iter, liter, eiter; /* clear tag */ - BM_ITER (eve, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { + BM_ITER_MESH (eve, &iter, em->bm, BM_VERTS_OF_MESH) { BM_elem_flag_disable(eve, BM_ELEM_TAG); } /* tag verts with a selected UV */ - BM_ITER (eve, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { - BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_VERT, eve) { + BM_ITER_MESH (eve, &iter, em->bm, BM_VERTS_OF_MESH) { + BM_ITER_ELEM (l, &liter, eve, BM_LOOPS_OF_VERT) { tf = CustomData_bmesh_get(&em->bm->pdata, l->f->head.data, CD_MTEXPOLY); if (!uvedit_face_visible(scene, ima, l->f, tf)) @@ -1423,16 +1423,16 @@ static void weld_align_uv(bContext *C, int tool) } /* flush vertex tags to edges */ - BM_ITER (eed, &iter, em->bm, BM_EDGES_OF_MESH, NULL) { + BM_ITER_MESH (eed, &iter, em->bm, BM_EDGES_OF_MESH) { BM_elem_flag_set(eed, BM_ELEM_TAG, (BM_elem_flag_test(eed->v1, BM_ELEM_TAG) && BM_elem_flag_test(eed->v2, BM_ELEM_TAG))); } /* find a vertex with only one tagged edge */ eve_start = NULL; - BM_ITER (eve, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { + BM_ITER_MESH (eve, &iter, em->bm, BM_VERTS_OF_MESH) { int tot_eed_tag = 0; - BM_ITER (eed, &eiter, em->bm, BM_EDGES_OF_VERT, eve) { + BM_ITER_ELEM (eed, &eiter, eve, BM_EDGES_OF_VERT) { if (BM_elem_flag_test(eed, BM_ELEM_TAG)) { tot_eed_tag++; } @@ -1461,7 +1461,7 @@ static void weld_align_uv(bContext *C, int tool) eve_next = NULL; /* find next eve */ - BM_ITER (eed, &eiter, em->bm, BM_EDGES_OF_VERT, eve) { + BM_ITER_ELEM (eed, &eiter, eve, BM_EDGES_OF_VERT) { if (BM_elem_flag_test(eed, BM_ELEM_TAG)) { BMVert *eve_other = BM_edge_other_vert(eed, eve); if (BM_elem_flag_test(eve_other, BM_ELEM_TAG)) { @@ -1499,7 +1499,7 @@ static void weld_align_uv(bContext *C, int tool) /* go over all verts except for endpoints */ for (i = 0; i < BLI_array_count(eve_line); i++) { - BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_VERT, eve_line[i]) { + BM_ITER_ELEM (l, &liter, eve_line[i], BM_LOOPS_OF_VERT) { tf = CustomData_bmesh_get(&em->bm->pdata, l->f->head.data, CD_MTEXPOLY); if (!uvedit_face_visible(scene, ima, l->f, tf)) @@ -1637,13 +1637,13 @@ static void select_all_perform(bContext *C, int action) else { if (action == SEL_TOGGLE) { action = SEL_SELECT; - BM_ITER (efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { tf = CustomData_bmesh_get(&em->bm->pdata, efa->head.data, CD_MTEXPOLY); if (!uvedit_face_visible(scene, ima, efa, tf)) continue; - BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { + BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) { luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); if (luv->flag & MLOOPUV_VERTSEL) { @@ -1655,13 +1655,13 @@ static void select_all_perform(bContext *C, int action) } - BM_ITER (efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { tf = CustomData_bmesh_get(&em->bm->pdata, efa->head.data, CD_MTEXPOLY); if (!uvedit_face_visible(scene, ima, efa, tf)) continue; - BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { + BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) { luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); switch (action) { @@ -1856,7 +1856,7 @@ static int mouse_select(bContext *C, float co[2], int extend, int loop) BLI_array_growitems(hitv, hit.efa->len); BLI_array_growitems(hituv, hit.efa->len); i = 0; - BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_FACE, hit.efa) { + BM_ITER_ELEM (l, &liter, hit.efa, BM_LOOPS_OF_FACE) { luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); hituv[i] = luv->uv; hitv[i] = BM_elem_index_get(l->v); @@ -1935,12 +1935,12 @@ static int mouse_select(bContext *C, float co[2], int extend, int loop) /* deselect */ if (select == 0) { - BM_ITER (efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { tf = CustomData_bmesh_get(&em->bm->pdata, efa->head.data, CD_MTEXPOLY); if (!uvedit_face_visible(scene, ima, efa, tf)) continue; - BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { + BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) { luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); if (sticky_select(limit, hitv, BM_elem_index_get(l->v), hituv, luv->uv, sticky, hitlen)) uvedit_uv_deselect(em, scene, l); @@ -1950,12 +1950,12 @@ static int mouse_select(bContext *C, float co[2], int extend, int loop) } /* select */ else { - BM_ITER (efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { tf = CustomData_bmesh_get(&em->bm->pdata, efa->head.data, CD_MTEXPOLY); if (!uvedit_face_visible(scene, ima, efa, tf)) continue; - BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { + BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) { luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); if (sticky_select(limit, hitv, BM_elem_index_get(l->v), hituv, luv->uv, sticky, hitlen)) uvedit_uv_select(em, scene, l); @@ -1968,7 +1968,7 @@ static int mouse_select(bContext *C, float co[2], int extend, int loop) } else { /* deselect all */ - BM_ITER (efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { uvedit_face_deselect(scene, em, efa); } @@ -1989,12 +1989,12 @@ static int mouse_select(bContext *C, float co[2], int extend, int loop) /* select sticky uvs */ if (sticky != SI_STICKY_DISABLE) { - BM_ITER (efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { tf = CustomData_bmesh_get(&em->bm->pdata, efa->head.data, CD_MTEXPOLY); if (!uvedit_face_visible(scene, ima, efa, tf)) continue; - BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { + BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) { if (sticky == SI_STICKY_DISABLE) continue; luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); @@ -2241,14 +2241,14 @@ static int unlink_selection_exec(bContext *C, wmOperator *op) return OPERATOR_CANCELLED; } - BM_ITER (efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { int desel = 0; tf = CustomData_bmesh_get(&em->bm->pdata, efa->head.data, CD_MTEXPOLY); if (!uvedit_face_visible(scene, ima, efa, tf)) continue; - BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { + BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) { luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); if (!(luv->flag & MLOOPUV_VERTSEL)) { @@ -2258,7 +2258,7 @@ static int unlink_selection_exec(bContext *C, wmOperator *op) } if (desel) { - BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { + BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) { luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); luv->flag &= ~MLOOPUV_VERTSEL; } @@ -2313,23 +2313,23 @@ static void uv_faces_do_sticky(bContext *C, SpaceImage *sima, Scene *scene, Obje * in the loop and select all MLoopUV's that use a touched vert. */ BMVert *eve; - BM_ITER (eve, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { + BM_ITER_MESH (eve, &iter, em->bm, BM_VERTS_OF_MESH) { BM_elem_flag_disable(eve, BM_ELEM_TAG); } - BM_ITER (efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { if (BM_elem_flag_test(efa, BM_ELEM_TAG)) { - BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { + BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) { BM_elem_flag_enable(l->v, BM_ELEM_TAG); } } } /* now select tagged verts */ - BM_ITER (efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { /* tf = CustomData_bmesh_get(&em->bm->pdata, efa->head.data, CD_MTEXPOLY); */ /* UNUSED */ - BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { + BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) { if (BM_elem_flag_test(l->v, BM_ELEM_TAG)) { if (select) uvedit_uv_select(em, scene, l); @@ -2364,7 +2364,7 @@ static void uv_faces_do_sticky(bContext *C, SpaceImage *sima, Scene *scene, Obje if (BM_elem_flag_test(efa, BM_ELEM_TAG)) { /* tf = CustomData_bmesh_get(&em->bm->pdata, efa->head.data, CD_MTEXPOLY); */ /* UNUSED */ - BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { + BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) { if (select) uvedit_uv_select(em, scene, l); else @@ -2407,7 +2407,7 @@ static void uv_faces_do_sticky(bContext *C, SpaceImage *sima, Scene *scene, Obje } else { /* SI_STICKY_DISABLE or ts->uv_flag & UV_SYNC_SELECTION */ - BM_ITER (efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { if (BM_elem_flag_test(efa, BM_ELEM_TAG)) { if (select) uvedit_face_select(scene, em, efa); @@ -2465,7 +2465,7 @@ static int border_select_exec(bContext *C, wmOperator *op) change = 0; - BM_ITER (efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { /* assume not touched */ BM_elem_flag_disable(efa, BM_ELEM_TAG); @@ -2487,11 +2487,11 @@ static int border_select_exec(bContext *C, wmOperator *op) /* other selection modes */ change = 1; - BM_ITER (efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { tf = CustomData_bmesh_get(&em->bm->pdata, efa->head.data, CD_MTEXPOLY); if (!uvedit_face_visible(scene, ima, efa, tf)) continue; - BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { + BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) { luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); if (!pinned || (ts->uv_flag & UV_SYNC_SELECTION) ) { @@ -2608,8 +2608,8 @@ static int circle_select_exec(bContext *C, wmOperator *op) UI_view2d_region_to_view(&ar->v2d, x, y, &offset[0], &offset[1]); /* do selection */ - BM_ITER (efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { - BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { + BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { + BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) { luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); select_uv_inside_ellipse(em, sima, scene, select, offset, ellipse, l, luv); } @@ -2728,12 +2728,12 @@ static int snap_uvs_to_cursor(Scene *scene, Image *ima, Object *obedit, SpaceIma MLoopUV *luv; short change = 0; - BM_ITER (efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { tface = CustomData_bmesh_get(&em->bm->pdata, efa->head.data, CD_MTEXPOLY); if (!uvedit_face_visible(scene, ima, efa, tface)) continue; - BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { + BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) { if (uvedit_uv_selected(em, scene, l)) { luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); copy_v2_v2(luv->uv, sima->cursor); @@ -2758,11 +2758,11 @@ static int snap_uvs_to_adjacent_unselected(Scene *scene, Image *ima, Object *obe /* index every vert that has a selected UV using it, but only once so as to * get unique indices and to count how much to malloc */ - BM_ITER (f, &iter, bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (f, &iter, bm, BM_FACES_OF_MESH) { tface = CustomData_bmesh_get(&bm->pdata, f->head.data, CD_MTEXPOLY); if (uvedit_face_visible(scene, ima, f, tface)) { BM_elem_flag_enable(f, BM_ELEM_TAG); - BM_ITER (l, &liter, bm, BM_LOOPS_OF_FACE, f) { + BM_ITER_ELEM (l, &liter, f, BM_LOOPS_OF_FACE) { BM_elem_flag_set(l, BM_ELEM_TAG, uvedit_uv_selected(em, scene, l)); } } @@ -2771,14 +2771,14 @@ static int snap_uvs_to_adjacent_unselected(Scene *scene, Image *ima, Object *obe } } - BM_ITER (f, &iter, bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (f, &iter, bm, BM_FACES_OF_MESH) { if (BM_elem_flag_test(f, BM_ELEM_TAG)) { /* face: visible */ - BM_ITER (l, &liter, bm, BM_LOOPS_OF_FACE, f) { + BM_ITER_ELEM (l, &liter, f, BM_LOOPS_OF_FACE) { if (BM_elem_flag_test(l, BM_ELEM_TAG)) { /* loop: selected*/ float uv[2] = {0.0f, 0.0f}; int uv_tot = 0; - BM_ITER (lsub, &lsubiter, bm, BM_LOOPS_OF_VERT, l->v) { + BM_ITER_ELEM (lsub, &lsubiter, l->v, BM_LOOPS_OF_VERT) { if (BM_elem_flag_test(lsub->f, BM_ELEM_TAG) && /* face: visible */ !BM_elem_flag_test(lsub, BM_ELEM_TAG)) /* loop: unselected */ { @@ -2819,12 +2819,12 @@ static int snap_uvs_to_pixels(SpaceImage *sima, Scene *scene, Object *obedit) w = (float)width; h = (float)height; - BM_ITER (efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { tface = CustomData_bmesh_get(&em->bm->pdata, efa->head.data, CD_MTEXPOLY); if (!uvedit_face_visible(scene, ima, efa, tface)) continue; - BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { + BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) { if (uvedit_uv_selected(em, scene, l)) { luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); snap_uv_to_pixel(luv->uv, w, h); @@ -2904,12 +2904,12 @@ static int pin_exec(bContext *C, wmOperator *op) MLoopUV *luv; int clear = RNA_boolean_get(op->ptr, "clear"); - BM_ITER (efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { tface = CustomData_bmesh_get(&em->bm->pdata, efa->head.data, CD_MTEXPOLY); if (!uvedit_face_visible(scene, ima, efa, tface)) continue; - BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { + BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) { luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); if (!clear) { @@ -2958,12 +2958,12 @@ static int select_pinned_exec(bContext *C, wmOperator *UNUSED(op)) MTexPoly *tface; MLoopUV *luv; - BM_ITER (efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { tface = CustomData_bmesh_get(&em->bm->pdata, efa->head.data, CD_MTEXPOLY); if (!uvedit_face_visible(scene, ima, efa, tface)) continue; - BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { + BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) { luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); if (luv->flag & MLOOPUV_PINNED) @@ -3035,7 +3035,7 @@ static int hide_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } - BM_ITER (efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { int hide = 0; tf = CustomData_bmesh_get(&em->bm->pdata, efa->head.data, CD_MTEXPOLY); @@ -3044,7 +3044,7 @@ static int hide_exec(bContext *C, wmOperator *op) continue; } - BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { + BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) { luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); if (UV_SEL_TEST(luv, !swap)) { @@ -3066,7 +3066,7 @@ static int hide_exec(bContext *C, wmOperator *op) } else { if (bm_face_is_all_uv_sel(em->bm, efa, TRUE) == !swap) { - BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { + BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) { luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); if (UV_SEL_TEST(luv, !swap)) { BM_elem_select_set(em->bm, l->v, FALSE); @@ -3086,7 +3086,7 @@ static int hide_exec(bContext *C, wmOperator *op) } } else { - BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { + BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) { luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); if (UV_SEL_TEST(luv, !swap)) { BM_elem_select_set(em->bm, l->v, FALSE); @@ -3153,10 +3153,10 @@ static int reveal_exec(bContext *C, wmOperator *UNUSED(op)) } if (facemode) { if (em->selectmode == SCE_SELECT_FACE) { - BM_ITER (efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { BM_elem_flag_disable(efa, BM_ELEM_TAG); if (!BM_elem_flag_test(efa, BM_ELEM_HIDDEN) && !BM_elem_flag_test(efa, BM_ELEM_SELECT)) { - BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { + BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) { luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); luv->flag |= MLOOPUV_VERTSEL; } @@ -3168,16 +3168,16 @@ static int reveal_exec(bContext *C, wmOperator *UNUSED(op)) else { /* enable adjacent faces to have disconnected UV selections if sticky is disabled */ if (!stickymode) { - BM_ITER (efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { BM_elem_flag_disable(efa, BM_ELEM_TAG); if (!BM_elem_flag_test(efa, BM_ELEM_HIDDEN) && !BM_elem_flag_test(efa, BM_ELEM_SELECT)) { int totsel = 0; - BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { + BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) { totsel += BM_elem_flag_test(l->v, BM_ELEM_SELECT); } if (!totsel) { - BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { + BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) { luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); luv->flag |= MLOOPUV_VERTSEL; } @@ -3188,10 +3188,10 @@ static int reveal_exec(bContext *C, wmOperator *UNUSED(op)) } } else { - BM_ITER (efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { BM_elem_flag_disable(efa, BM_ELEM_TAG); if (!BM_elem_flag_test(efa, BM_ELEM_HIDDEN) && !BM_elem_flag_test(efa, BM_ELEM_SELECT)) { - BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { + BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) { if (BM_elem_flag_test(l->v, BM_ELEM_SELECT) == 0) { luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); luv->flag |= MLOOPUV_VERTSEL; @@ -3205,10 +3205,10 @@ static int reveal_exec(bContext *C, wmOperator *UNUSED(op)) } } else if (em->selectmode == SCE_SELECT_FACE) { - BM_ITER (efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { BM_elem_flag_disable(efa, BM_ELEM_TAG); if (!BM_elem_flag_test(efa, BM_ELEM_HIDDEN) && !BM_elem_flag_test(efa, BM_ELEM_SELECT)) { - BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { + BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) { luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); luv->flag |= MLOOPUV_VERTSEL; } @@ -3218,10 +3218,10 @@ static int reveal_exec(bContext *C, wmOperator *UNUSED(op)) } } else { - BM_ITER (efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { BM_elem_flag_disable(efa, BM_ELEM_TAG); if (!BM_elem_flag_test(efa, BM_ELEM_HIDDEN) && !BM_elem_flag_test(efa, BM_ELEM_SELECT)) { - BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { + BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) { if (BM_elem_flag_test(l->v, BM_ELEM_SELECT) == 0) { luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); luv->flag |= MLOOPUV_VERTSEL; @@ -3395,7 +3395,7 @@ static int seams_from_islands_exec(bContext *C, wmOperator *op) EDBM_index_arrays_init(em, 0, 0, 1); vmap = EDBM_uv_vert_map_create(em, 0, 0, limit); - BM_ITER (editedge, &iter, bm, BM_EDGES_OF_MESH, NULL) { + BM_ITER_MESH (editedge, &iter, bm, BM_EDGES_OF_MESH) { /* flags to determine if we uv is separated from first editface match */ char separated1 = 0, separated2; /* set to denote edge must be flagged as seam */ @@ -3511,8 +3511,8 @@ static int mark_seam_exec(bContext *C, wmOperator *UNUSED(op)) BMIter iter, liter; - BM_ITER (efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { - BM_ITER (loop, &liter, bm, BM_LOOPS_OF_FACE, efa) { + BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { + BM_ITER_ELEM (loop, &liter, efa, BM_LOOPS_OF_FACE) { if (uvedit_edge_selected(em, scene, loop)) { BM_elem_flag_enable(loop->e, BM_ELEM_SEAM); } diff --git a/source/blender/editors/uvedit/uvedit_smart_stitch.c b/source/blender/editors/uvedit/uvedit_smart_stitch.c index cd89dd4b294..53572f114d2 100644 --- a/source/blender/editors/uvedit/uvedit_smart_stitch.c +++ b/source/blender/editors/uvedit/uvedit_smart_stitch.c @@ -686,7 +686,7 @@ static int stitch_process_data(StitchState *state, Scene *scene, int final) } /* copy data from MTFaces to the preview display buffers */ - BM_ITER (efa, &iter, state->em->bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, state->em->bm, BM_FACES_OF_MESH) { /* just to test if face was added for processing. uvs of inselected vertices will return NULL */ UvElement *element = ED_uv_element_get(state->element_map, efa, BM_FACE_FIRST_LOOP(efa)); @@ -696,7 +696,7 @@ static int stitch_process_data(StitchState *state, Scene *scene, int final) int face_preview_pos = preview_position[index].data_position; if (face_preview_pos != STITCH_NO_PREVIEW) { preview->uvs_per_polygon[preview_position[index].polycount_position] = efa->len; - BM_ITER_INDEX (l, &liter, state->em->bm, BM_LOOPS_OF_FACE, efa, i) { + BM_ITER_ELEM_INDEX (l, &liter, efa, BM_LOOPS_OF_FACE, i) { luv = CustomData_bmesh_get(&state->em->bm->ldata, l->head.data, CD_MLOOPUV); copy_v2_v2(preview->preview_polys + face_preview_pos + i * 2, luv->uv); } @@ -706,7 +706,7 @@ static int stitch_process_data(StitchState *state, Scene *scene, int final) BMLoop *fl = BM_FACE_FIRST_LOOP(efa); MLoopUV *fuv = CustomData_bmesh_get(&state->em->bm->ldata, fl->head.data, CD_MLOOPUV); - BM_ITER_INDEX (l, &liter, state->em->bm, BM_LOOPS_OF_FACE, efa, i) { + BM_ITER_ELEM_INDEX (l, &liter, efa, BM_LOOPS_OF_FACE, i) { if (i < numoftris) { /* using next since the first uv is already accounted for */ BMLoop *lnext = l->next; @@ -1061,11 +1061,11 @@ static int stitch_init(bContext *C, wmOperator *op) counter = 0; /* Now, on to generate our uv connectivity data */ - BM_ITER (efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { if (!(ts->uv_flag & UV_SYNC_SELECTION) && ((BM_elem_flag_test(efa, BM_ELEM_HIDDEN)) || !BM_elem_flag_test(efa, BM_ELEM_SELECT))) continue; - BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { + BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) { UvElement *element = ED_uv_element_get(state->element_map, efa, l); int offset1, itmp1 = element - state->element_map->buf; int offset2, itmp2 = ED_uv_element_get(state->element_map, efa, l->next) - state->element_map->buf; @@ -1177,9 +1177,9 @@ static int stitch_init(bContext *C, wmOperator *op) } else { - BM_ITER (efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { i = 0; - BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { + BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) { if (uvedit_uv_selected(em, scene, l)) { UvElement *element = ED_uv_element_get(state->element_map, efa, l); stitch_select_uv(element, state, 1); @@ -1197,7 +1197,7 @@ static int stitch_init(bContext *C, wmOperator *op) state->tris_per_island[i] = 0; } - BM_ITER (efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { UvElement *element = ED_uv_element_get(state->element_map, efa, BM_FACE_FIRST_LOOP(efa)); if (element) { diff --git a/source/blender/editors/uvedit/uvedit_unwrap_ops.c b/source/blender/editors/uvedit/uvedit_unwrap_ops.c index 8c3906a2c2d..ad78a5b6643 100644 --- a/source/blender/editors/uvedit/uvedit_unwrap_ops.c +++ b/source/blender/editors/uvedit/uvedit_unwrap_ops.c @@ -138,7 +138,7 @@ static int ED_uvedit_ensure_uvs(bContext *C, Scene *scene, Object *obedit) ED_uvedit_assign_image(bmain, scene, obedit, ima, NULL); /* select new UV's */ - BM_ITER (efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { uvedit_face_select(scene, em, efa); } @@ -156,7 +156,7 @@ static int uvedit_have_selection(Scene *scene, BMEditMesh *em, short implicit) /* verify if we have any selected uv's before unwrapping, * so we can cancel the operator early */ - BM_ITER (efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { if (scene->toolsettings->uv_flag & UV_SYNC_SELECTION) { if (BM_elem_flag_test(efa, BM_ELEM_HIDDEN)) continue; @@ -164,7 +164,7 @@ static int uvedit_have_selection(Scene *scene, BMEditMesh *em, short implicit) else if (BM_elem_flag_test(efa, BM_ELEM_HIDDEN) || !BM_elem_flag_test(efa, BM_ELEM_SELECT)) continue; - BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { + BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) { luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); if (!luv) return 1; @@ -215,7 +215,7 @@ static ParamHandle *construct_param_handle(Scene *scene, BMEditMesh *em, BLI_srand(0); - BM_ITER (efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { ScanFillVert *v, *lastv, *firstv; ScanFillFace *sefa; ParamKey key, vkeys[4]; @@ -230,7 +230,7 @@ static ParamHandle *construct_param_handle(Scene *scene, BMEditMesh *em, lsel = 0; - BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { + BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) { if (uvedit_uv_selected(em, scene, l)) { lsel = 1; break; @@ -247,7 +247,7 @@ static ParamHandle *construct_param_handle(Scene *scene, BMEditMesh *em, /* for quads let parametrize split, it can make better decisions about which split is best for unwrapping than scanfill */ i = 0; - 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); vkeys[i] = (ParamKey)BM_elem_index_get(l->v); co[i] = l->v->co; @@ -265,7 +265,7 @@ static ParamHandle *construct_param_handle(Scene *scene, BMEditMesh *em, BLI_begin_edgefill(&sf_ctx); firstv = lastv = NULL; - BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { + BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) { int i; v = BLI_addfillvert(&sf_ctx, l->v->co); @@ -311,7 +311,7 @@ static ParamHandle *construct_param_handle(Scene *scene, BMEditMesh *em, } if (!implicit) { - BM_ITER (eed, &iter, em->bm, BM_EDGES_OF_MESH, NULL) { + BM_ITER_MESH (eed, &iter, em->bm, BM_EDGES_OF_MESH) { if (BM_elem_flag_test(eed, BM_ELEM_SEAM)) { ParamKey vkeys[2]; vkeys[0] = (ParamKey)BM_elem_index_get(eed->v1); @@ -340,7 +340,7 @@ static void texface_from_original_index(BMFace *efa, int index, float **uv, Para if (index == ORIGINDEX_NONE) return; - BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { + BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) { if (BM_elem_index_get(l->v) == index) { luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); *uv = luv->uv; @@ -868,9 +868,9 @@ static void uv_map_transform_center(Scene *scene, View3D *v3d, float *result, min[0] = min[1] = min[2] = 1e20f; max[0] = max[1] = max[2] = -1e20f; - BM_ITER (efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { if (BM_elem_flag_test(efa, BM_ELEM_SELECT)) { - BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { + BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) { DO_MINMAX(l->v->co, min, max); } } @@ -1020,11 +1020,11 @@ static void correct_uv_aspect(BMEditMesh *em) if (aspx > aspy) { scale = aspy / aspx; - BM_ITER (efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { if (!BM_elem_flag_test(efa, BM_ELEM_SELECT) || 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) { luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); luv->uv[0] = ((luv->uv[0] - 0.5) * scale) + 0.5; } @@ -1033,11 +1033,11 @@ static void correct_uv_aspect(BMEditMesh *em) else { scale = aspx / aspy; - BM_ITER (efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { if (!BM_elem_flag_test(efa, BM_ELEM_SELECT) || 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) { luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); luv->uv[1] = ((luv->uv[1] - 0.5) * scale) + 0.5; } @@ -1075,11 +1075,11 @@ static void uv_map_clip_correct(BMEditMesh *em, wmOperator *op) if (scale_to_bounds) { INIT_MINMAX2(min, max); - BM_ITER (efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { if (!BM_elem_flag_test(efa, BM_ELEM_SELECT)) continue; - BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { + BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) { luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); DO_MINMAX2(luv->uv, min, max); } @@ -1094,11 +1094,11 @@ static void uv_map_clip_correct(BMEditMesh *em, wmOperator *op) if (dy > 0.0f) dy = 1.0f / dy; - BM_ITER (efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { if (!BM_elem_flag_test(efa, BM_ELEM_SELECT)) continue; - BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { + BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) { luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); luv->uv[0] = (luv->uv[0] - min[0]) * dx; @@ -1108,11 +1108,11 @@ static void uv_map_clip_correct(BMEditMesh *em, wmOperator *op) } else if (clip_to_bounds) { /* clipping and wrapping */ - BM_ITER (efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { if (!BM_elem_flag_test(efa, BM_ELEM_SELECT)) continue; - BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { + BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) { luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); CLAMP(luv->uv[0], 0.0f, 1.0f); CLAMP(luv->uv[1], 0.0f, 1.0f); @@ -1257,11 +1257,11 @@ static int uv_from_view_exec(bContext *C, wmOperator *op) if (RNA_boolean_get(op->ptr, "orthographic")) { uv_map_rotation_matrix(rotmat, rv3d, obedit, 90.0f, 0.0f, 1.0f); - BM_ITER (efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { if (!BM_elem_flag_test(efa, BM_ELEM_SELECT)) continue; - BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { + BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) { luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); project_from_view_ortho(luv->uv, l->v->co, rotmat); } @@ -1271,11 +1271,11 @@ static int uv_from_view_exec(bContext *C, wmOperator *op) struct UvCameraInfo *uci = project_camera_info(v3d->camera, obedit->obmat, scene->r.xsch, scene->r.ysch); if (uci) { - BM_ITER (efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { if (!BM_elem_flag_test(efa, BM_ELEM_SELECT)) continue; - BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { + BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) { luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); project_from_camera(luv->uv, l->v->co, uci); } @@ -1287,11 +1287,11 @@ static int uv_from_view_exec(bContext *C, wmOperator *op) else { copy_m4_m4(rotmat, obedit->obmat); - BM_ITER (efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { if (!BM_elem_flag_test(efa, BM_ELEM_SELECT)) continue; - BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { + BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) { luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); project_from_view(luv->uv, l->v->co, rv3d->persmat, rotmat, ar->winx, ar->winy); } @@ -1394,7 +1394,7 @@ static void uv_map_mirror(BMEditMesh *em, BMFace *efa, MTexPoly *UNUSED(tf)) int i, mi; i = 0; - BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { + BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) { luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); uvs[i] = luv->uv; i++; @@ -1434,11 +1434,11 @@ static int sphere_project_exec(bContext *C, wmOperator *op) uv_map_transform(C, op, center, rotmat); - BM_ITER (efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { if (!BM_elem_flag_test(efa, BM_ELEM_SELECT)) continue; - BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { + BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) { luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); uv_sphere_project(luv->uv, l->v->co, center, rotmat); @@ -1507,12 +1507,12 @@ static int cylinder_project_exec(bContext *C, wmOperator *op) uv_map_transform(C, op, center, rotmat); - BM_ITER (efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { tf = CustomData_bmesh_get(&em->bm->pdata, efa->head.data, CD_MTEXPOLY); if (!BM_elem_flag_test(efa, BM_ELEM_SELECT)) continue; - BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { + BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) { luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); uv_cylinder_project(luv->uv, l->v->co, center, rotmat); @@ -1571,7 +1571,7 @@ static int cube_project_exec(bContext *C, wmOperator *op) /* choose x,y,z axis for projection depending on the largest normal * component, but clusters all together around the center of map. */ - BM_ITER (efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { int first = 1; /* tf = CustomData_bmesh_get(&em->bm->pdata, efa->head.data, CD_MTEXPOLY); */ /* UNUSED */ @@ -1581,7 +1581,7 @@ static int cube_project_exec(bContext *C, wmOperator *op) axis_dominant_v3(&cox, &coy, efa->no); dx = dy = 0; - BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { + BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) { luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); luv->uv[0] = 0.5f + 0.5f * cube_size * (loc[cox] + l->v->co[cox]); |