[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45734] trunk/blender/source/blender: code cleanup: replace use of BM_edge_face_count with BM_edge_is_manifold and BM_edge_is_boundary

[Campbell Barton]

Revision: 45734
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45734
Author:   campbellbarton
Date:     2012-04-18 06:44:48 +0000 (Wed, 18 Apr 2012)
Log Message:
-----------
code cleanup: replace use of BM_edge_face_count with BM_edge_is_manifold and BM_edge_is_boundary

Modified Paths:
--------------
    trunk/blender/source/blender/bmesh/intern/bmesh_queries.c
    trunk/blender/source/blender/bmesh/operators/bmo_dissolve.c
    trunk/blender/source/blender/editors/mesh/editmesh_rip.c

Modified: trunk/blender/source/blender/bmesh/intern/bmesh_queries.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_queries.c	2012-04-18 06:36:47 UTC (rev 45733)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_queries.c	2012-04-18 06:44:48 UTC (rev 45734)
@@ -802,7 +802,7 @@
  */
 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);

Modified: trunk/blender/source/blender/bmesh/operators/bmo_dissolve.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_dissolve.c	2012-04-18 06:36:47 UTC (rev 45733)
+++ trunk/blender/source/blender/bmesh/operators/bmo_dissolve.c	2012-04-18 06:44:48 UTC (rev 45734)
@@ -308,7 +308,7 @@
 				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);

Modified: trunk/blender/source/blender/editors/mesh/editmesh_rip.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_rip.c	2012-04-18 06:36:47 UTC (rev 45733)
+++ trunk/blender/source/blender/editors/mesh/editmesh_rip.c	2012-04-18 06:44:48 UTC (rev 45734)
@@ -413,7 +413,7 @@
 				 * 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 @@
 		}
 
 		/* 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 @@
 				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);