From e947dd8cd765909ebadfc5e82d0d34116733b04e Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 27 Jun 2014 20:22:19 +1000 Subject: BMesh: add BM_vert_is_edge_pair(), faster then checking (BM_vert_edge_count(v) == 2) --- source/blender/bmesh/operators/bmo_dissolve.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'source/blender/bmesh/operators/bmo_dissolve.c') diff --git a/source/blender/bmesh/operators/bmo_dissolve.c b/source/blender/bmesh/operators/bmo_dissolve.c index 93296c51f8e..bebfeaa5b06 100644 --- a/source/blender/bmesh/operators/bmo_dissolve.c +++ b/source/blender/bmesh/operators/bmo_dissolve.c @@ -92,7 +92,7 @@ static void bm_face_split(BMesh *bm, const short oflag) BMIter liter; BM_ITER_MESH (v, &iter, bm, BM_VERTS_OF_MESH) { if (BMO_elem_flag_test(bm, v, oflag)) { - if (BM_vert_edge_count(v) > 2) { + if (BM_vert_is_edge_pair(v) == false) { BMLoop *l; BM_ITER_ELEM (l, &liter, v, BM_LOOPS_OF_VERT) { if (l->f->len > 3) { @@ -129,7 +129,7 @@ void bmo_dissolve_faces_exec(BMesh *bm, BMOperator *op) BMVert *v; BM_ITER_MESH (v, &viter, bm, BM_VERTS_OF_MESH) { - BMO_elem_flag_set(bm, v, VERT_MARK, (BM_vert_edge_count(v) != 2)); + BMO_elem_flag_set(bm, v, VERT_MARK, !BM_vert_is_edge_pair(v)); } } @@ -215,7 +215,7 @@ void bmo_dissolve_faces_exec(BMesh *bm, BMOperator *op) BM_ITER_MESH_MUTABLE (v, v_next, &viter, bm, BM_VERTS_OF_MESH) { if (BMO_elem_flag_test(bm, v, VERT_MARK)) { - if (BM_vert_edge_count(v) == 2) { + if (BM_vert_is_edge_pair(v)) { BM_vert_collapse_edge(bm, v->e, v, true, true); } } @@ -272,7 +272,7 @@ void bmo_dissolve_edges_exec(BMesh *bm, BMOperator *op) if (use_verts) { BM_ITER_MESH (v, &iter, bm, BM_VERTS_OF_MESH) { - BMO_elem_flag_set(bm, v, VERT_MARK, (BM_vert_edge_count(v) != 2)); + BMO_elem_flag_set(bm, v, VERT_MARK, !BM_vert_is_edge_pair(v)); } } @@ -327,7 +327,7 @@ void bmo_dissolve_edges_exec(BMesh *bm, BMOperator *op) if (use_verts) { BM_ITER_MESH_MUTABLE (v, v_next, &iter, bm, BM_VERTS_OF_MESH) { if (BMO_elem_flag_test(bm, v, VERT_MARK)) { - if (BM_vert_edge_count(v) == 2) { + if (BM_vert_is_edge_pair(v)) { BM_vert_collapse_edge(bm, v->e, v, true, true); } } -- cgit v1.2.3