diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-04-18 10:44:48 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-04-18 10:44:48 +0400 |
commit | f1ececaabba32fac6d22ca334fa58f48f43d281a (patch) | |
tree | a5e674dea87c0286f83ef1114a42573188e4289f /source | |
parent | 27696ddae19a2a58da407b4d1a2453ec0de60841 (diff) |
code cleanup: replace use of BM_edge_face_count with BM_edge_is_manifold and BM_edge_is_boundary
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/bmesh/intern/bmesh_queries.c | 2 | ||||
-rw-r--r-- | source/blender/bmesh/operators/bmo_dissolve.c | 2 | ||||
-rw-r--r-- | source/blender/editors/mesh/editmesh_rip.c | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/bmesh/intern/bmesh_queries.c b/source/blender/bmesh/intern/bmesh_queries.c index 92d26c0fc5a..5efdd547ba9 100644 --- a/source/blender/bmesh/intern/bmesh_queries.c +++ b/source/blender/bmesh/intern/bmesh_queries.c @@ -802,7 +802,7 @@ void BM_loop_face_tangent(BMLoop *l, float r_tangent[3]) */ float BM_edge_face_angle(BMEdge *e) { - if (BM_edge_face_count(e) == 2) { + if (BM_edge_is_manifold(e)) { BMLoop *l1 = e->l; BMLoop *l2 = e->l->radial_next; return angle_normalized_v3v3(l1->f->no, l2->f->no); diff --git a/source/blender/bmesh/operators/bmo_dissolve.c b/source/blender/bmesh/operators/bmo_dissolve.c index f08b2bffdc6..88b8eef0fbf 100644 --- a/source/blender/bmesh/operators/bmo_dissolve.c +++ b/source/blender/bmesh/operators/bmo_dissolve.c @@ -308,7 +308,7 @@ static int test_extra_verts(BMesh *bm, BMVert *v) found = FALSE; e = BM_iter_new(&iter2, bm, BM_EDGES_OF_VERT, l->v); for ( ; e; e = BM_iter_step(&iter2)) { - if (BM_edge_face_count(e) == 1) { + if (BM_edge_is_boundary(e)) { found = TRUE; } f2 = BM_iter_new(&iter3, bm, BM_FACES_OF_EDGE, e); diff --git a/source/blender/editors/mesh/editmesh_rip.c b/source/blender/editors/mesh/editmesh_rip.c index 6097acd6e49..f22a4ae9a97 100644 --- a/source/blender/editors/mesh/editmesh_rip.c +++ b/source/blender/editors/mesh/editmesh_rip.c @@ -413,7 +413,7 @@ static int edbm_rip_invoke(bContext *C, wmOperator *op, wmEvent *event) * otherwise we can't a face away from a wire edge */ totboundary_edge += (is_boundary != 0 || BM_edge_is_wire(e)); if (!BM_elem_flag_test(e, BM_ELEM_HIDDEN)) { - if (is_boundary == FALSE && BM_edge_face_count(e) == 2) { + if (is_boundary == FALSE && BM_edge_is_manifold(e)) { d = edbm_rip_rip_edgedist(ar, projectMat, e->v1->co, e->v2->co, fmval); if (d < dist) { dist = d; @@ -511,7 +511,7 @@ static int edbm_rip_invoke(bContext *C, wmOperator *op, wmEvent *event) } /* rip two adjacent edges */ - if (BM_edge_face_count(e2) == 1 || BM_vert_face_count(v) == 2) { + if (BM_edge_is_boundary(e2) || BM_vert_face_count(v) == 2) { l = e2->l; ripvert = BM_face_vert_separate(bm, l->f, v); @@ -520,7 +520,7 @@ static int edbm_rip_invoke(bContext *C, wmOperator *op, wmEvent *event) return OPERATOR_CANCELLED; } } - else if (BM_edge_face_count(e2) == 2) { + else if (BM_edge_is_manifold(e2)) { l = e2->l; e = BM_face_other_edge_loop(l->f, e2, v)->e; BM_elem_flag_enable(e, BM_ELEM_TAG); |