[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45735] trunk/blender/source/blender: more replacement for BM_edge_face_count() use.

[Campbell Barton]

Revision: 45735
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45735
Author:   campbellbarton
Date:     2012-04-18 06:57:28 +0000 (Wed, 18 Apr 2012)
Log Message:
-----------
more replacement for BM_edge_face_count() use.

Modified Paths:
--------------
    trunk/blender/source/blender/bmesh/intern/bmesh_walkers_impl.c
    trunk/blender/source/blender/bmesh/operators/bmo_triangulate.c
    trunk/blender/source/blender/bmesh/tools/BME_bevel.c
    trunk/blender/source/blender/editors/mesh/editmesh_select.c
    trunk/blender/source/blender/editors/mesh/editmesh_tools.c
    trunk/blender/source/blender/editors/transform/transform.c

Modified: trunk/blender/source/blender/bmesh/intern/bmesh_walkers_impl.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_walkers_impl.c	2012-04-18 06:44:48 UTC (rev 45734)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_walkers_impl.c	2012-04-18 06:57:28 UTC (rev 45735)
@@ -743,7 +743,7 @@
 	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;

Modified: trunk/blender/source/blender/bmesh/operators/bmo_triangulate.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_triangulate.c	2012-04-18 06:44:48 UTC (rev 45734)
+++ trunk/blender/source/blender/bmesh/operators/bmo_triangulate.c	2012-04-18 06:57:28 UTC (rev 45735)
@@ -106,7 +106,7 @@
 		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;
 			}
 

Modified: trunk/blender/source/blender/bmesh/tools/BME_bevel.c
===================================================================
--- trunk/blender/source/blender/bmesh/tools/BME_bevel.c	2012-04-18 06:44:48 UTC (rev 45734)
+++ trunk/blender/source/blender/bmesh/tools/BME_bevel.c	2012-04-18 06:57:28 UTC (rev 45735)
@@ -158,7 +158,7 @@
 
 	/* 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;
 		}
 	}

Modified: trunk/blender/source/blender/editors/mesh/editmesh_select.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_select.c	2012-04-18 06:44:48 UTC (rev 45734)
+++ trunk/blender/source/blender/editors/mesh/editmesh_select.c	2012-04-18 06:57:28 UTC (rev 45735)
@@ -2371,7 +2371,7 @@
 	}
 	
 	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);
 		}
 	}

Modified: trunk/blender/source/blender/editors/mesh/editmesh_tools.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_tools.c	2012-04-18 06:44:48 UTC (rev 45734)
+++ trunk/blender/source/blender/editors/mesh/editmesh_tools.c	2012-04-18 06:57:28 UTC (rev 45735)
@@ -2801,7 +2801,7 @@
 		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);
 		}
 	}

Modified: trunk/blender/source/blender/editors/transform/transform.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform.c	2012-04-18 06:44:48 UTC (rev 45734)
+++ trunk/blender/source/blender/editors/transform/transform.c	2012-04-18 06:57:28 UTC (rev 45735)
@@ -4437,7 +4437,7 @@
 
 	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 */