archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

more replacement for BM_edge_face_count() use.

Browse Source
This commit is contained in:
Campbell Barton
2012-04-18 06:57:28 +00:00
parent f1ececaabb
commit 1f01d62d15
6 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/bmesh/intern/bmesh_walkers_impl.c
View File

@@ -743,7 +743,7 @@ static void *bmw_FaceLoopWalker_step(BMWalker *walker)
if (!bmw_FaceLoopWalker_include_face(walker, l)) { if (!bmw_FaceLoopWalker_include_face(walker, l)) {
l = lwalk->l; l = lwalk->l;
l = l->next->next; 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->prev->prev;
} }
l = l->radial_next; l = l->radial_next;

2
source/blender/bmesh/operators/bmo_triangulate.c
View File

@@ -106,7 +106,7 @@ void bmo_beautify_fill_exec(BMesh *bm, BMOperator *op)
BM_ITER(e, &iter, bm, BM_EDGES_OF_MESH, NULL) { BM_ITER(e, &iter, bm, BM_EDGES_OF_MESH, NULL) {
BMVert *v1, *v2, *v3, *v4; 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; continue;
} }

2
source/blender/bmesh/tools/BME_bevel.c
View File

@@ -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 */ /* 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) { 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; return 0;
} }
} }

2
source/blender/editors/mesh/editmesh_select.c
View File

@@ -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) { 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); BM_elem_select_set(em->bm, e, TRUE);
} }
} }

2
source/blender/editors/mesh/editmesh_tools.c
View File

@@ -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)) if (BM_elem_flag_test(e, BM_ELEM_HIDDEN))
continue; continue;
if (BM_edge_face_count(e) != 0) { if (!BM_edge_is_wire(e)) {
BM_elem_select_set(em->bm, e, FALSE); BM_elem_select_set(em->bm, e, FALSE);
} }
} }

2
source/blender/editors/transform/transform.c
View File

@@ -4437,7 +4437,7 @@ static int createSlideVerts(TransInfo *t)
BM_ITER(e, &iter, em->bm, BM_EDGES_OF_MESH, NULL) { BM_ITER(e, &iter, em->bm, BM_EDGES_OF_MESH, NULL) {
if (BM_elem_flag_test(e, BM_ELEM_SELECT)) { 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); MEM_freeN(sld);
BMBVH_FreeBVH(btree); BMBVH_FreeBVH(btree);
return 0; /* can only handle exactly 2 faces around each edge */ return 0; /* can only handle exactly 2 faces around each edge */