diff options
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_walkers_impl.c | 2 | ||||
| -rw-r--r-- | source/blender/bmesh/operators/bmo_triangulate.c | 2 | ||||
| -rw-r--r-- | source/blender/bmesh/tools/BME_bevel.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/mesh/editmesh_select.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/mesh/editmesh_tools.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/transform/transform.c | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/bmesh/intern/bmesh_walkers_impl.c b/source/blender/bmesh/intern/bmesh_walkers_impl.c index ae7294ed4b6..cccda674b0f 100644 --- a/source/blender/bmesh/intern/bmesh_walkers_impl.c +++ b/source/blender/bmesh/intern/bmesh_walkers_impl.c @@ -743,7 +743,7 @@ static void *bmw_FaceLoopWalker_step(BMWalker *walker) if (!bmw_FaceLoopWalker_include_face(walker, l)) { l = lwalk->l; l = l->next->next; - if (BM_edge_face_count(l->e) != 2) { + if (!BM_edge_is_manifold(l->e)) { l = l->prev->prev; } l = l->radial_next; diff --git a/source/blender/bmesh/operators/bmo_triangulate.c b/source/blender/bmesh/operators/bmo_triangulate.c index 7d07dc075da..fd6106a11c9 100644 --- a/source/blender/bmesh/operators/bmo_triangulate.c +++ b/source/blender/bmesh/operators/bmo_triangulate.c @@ -106,7 +106,7 @@ void bmo_beautify_fill_exec(BMesh *bm, BMOperator *op) BM_ITER(e, &iter, bm, BM_EDGES_OF_MESH, NULL) { BMVert *v1, *v2, *v3, *v4; - if (BM_edge_face_count(e) != 2 || BMO_elem_flag_test(bm, e, EDGE_MARK)) { + if (!BM_edge_is_manifold(e) || BMO_elem_flag_test(bm, e, EDGE_MARK)) { continue; } diff --git a/source/blender/bmesh/tools/BME_bevel.c b/source/blender/bmesh/tools/BME_bevel.c index 5ef70f9cc2b..c3796fe492f 100644 --- a/source/blender/bmesh/tools/BME_bevel.c +++ b/source/blender/bmesh/tools/BME_bevel.c @@ -158,7 +158,7 @@ static int BME_Bevel_Dissolve_Disk(BMesh *bm, BMVert *v) /* hrmf, we could have a version of BM_vert_is_manifold() which checks for this case */ BM_ITER(e, &iter, bm, BM_EDGES_OF_VERT, v) { - if (BM_edge_face_count(e) != 2) { + if (!BM_edge_is_manifold(e)) { return 0; } } diff --git a/source/blender/editors/mesh/editmesh_select.c b/source/blender/editors/mesh/editmesh_select.c index 00835b79593..6505337d1a4 100644 --- a/source/blender/editors/mesh/editmesh_select.c +++ b/source/blender/editors/mesh/editmesh_select.c @@ -2371,7 +2371,7 @@ static int edbm_select_non_manifold_exec(bContext *C, wmOperator *op) } BM_ITER(e, &iter, em->bm, BM_EDGES_OF_MESH, NULL) { - if (!BM_elem_flag_test(e, BM_ELEM_HIDDEN) && BM_edge_face_count(e) != 2) { + if (!BM_elem_flag_test(e, BM_ELEM_HIDDEN) && !BM_edge_is_manifold(e)) { BM_elem_select_set(em->bm, e, TRUE); } } diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c index 557c8797a26..12cd7893f5a 100644 --- a/source/blender/editors/mesh/editmesh_tools.c +++ b/source/blender/editors/mesh/editmesh_tools.c @@ -2801,7 +2801,7 @@ static int mesh_separate_selected(Main *bmain, Scene *scene, Base *editbase, wmO if (BM_elem_flag_test(e, BM_ELEM_HIDDEN)) continue; - if (BM_edge_face_count(e) != 0) { + if (!BM_edge_is_wire(e)) { BM_elem_select_set(em->bm, e, FALSE); } } diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index f4bfa1e0172..0a85c523c93 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -4437,7 +4437,7 @@ static int createSlideVerts(TransInfo *t) BM_ITER(e, &iter, em->bm, BM_EDGES_OF_MESH, NULL) { if (BM_elem_flag_test(e, BM_ELEM_SELECT)) { - if (BM_edge_face_count(e) != 2) { + if (!BM_edge_is_manifold(e)) { MEM_freeN(sld); BMBVH_FreeBVH(btree); return 0; /* can only handle exactly 2 faces around each edge */ |