[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52132] trunk/blender: replace BM_edge_face_count with BM_edge_is_manifold/BM_edge_is_wire/ BM_edge_is_boundary

[Campbell Barton]

Revision: 52132
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52132
Author:   campbellbarton
Date:     2012-11-12 04:50:45 +0000 (Mon, 12 Nov 2012)
Log Message:
-----------
replace BM_edge_face_count with BM_edge_is_manifold/BM_edge_is_wire/BM_edge_is_boundary

Modified Paths:
--------------
    trunk/blender/CMakeLists.txt
    trunk/blender/source/blender/bmesh/operators/bmo_bevel.c
    trunk/blender/source/blender/bmesh/operators/bmo_hull.c
    trunk/blender/source/blender/bmesh/operators/bmo_symmetrize.c

Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt	2012-11-12 03:41:25 UTC (rev 52131)
+++ trunk/blender/CMakeLists.txt	2012-11-12 04:50:45 UTC (rev 52132)
@@ -353,12 +353,20 @@
 	message(FATAL_ERROR "WITH_PLAYER requires WITH_GAMEENGINE")
 endif()
 
-if(NOT WITH_AUDASPACE AND (WITH_OPENAL OR WITH_JACK OR WITH_GAMEENGINE))
-	message(FATAL_ERROR "WITH_OPENAL/WITH_JACK/WITH_CODEC_FFMPEG/WITH_GAMEENGINE require WITH_AUDASPACE")
+if(NOT WITH_AUDASPACE)
+	if(WITH_OPENAL)
+		message(FATAL_ERROR "WITH_OPENAL requires WITH_AUDASPACE")
+	endif()
+	if(WITH_JACK)
+		message(FATAL_ERROR "WITH_JACK requires WITH_AUDASPACE")
+	endif()
+	if(WITH_GAMEENGINE)
+		message(FATAL_ERROR "WITH_GAMEENGINE requires WITH_AUDASPACE")
+	endif()
 endif()
 
 if(NOT WITH_SDL AND WITH_GHOST_SDL)
-	message(FATAL_ERROR "WITH_GHOST_SDL requires WITH_SDL to be ON")
+	message(FATAL_ERROR "WITH_GHOST_SDL requires WITH_SDL")
 endif()
 
 if(WITH_IMAGE_REDCODE AND ((NOT WITH_IMAGE_OPENJPEG) OR (NOT WITH_CODEC_FFMPEG)))

Modified: trunk/blender/source/blender/bmesh/operators/bmo_bevel.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_bevel.c	2012-11-12 03:41:25 UTC (rev 52131)
+++ trunk/blender/source/blender/bmesh/operators/bmo_bevel.c	2012-11-12 04:50:45 UTC (rev 52132)
@@ -1097,7 +1097,7 @@
 	 * Only bevel selected edges that have exactly two incident faces. */
 	BMO_ITER (bme, &siter, bm, op, "geom", BM_EDGE) {
 		if ((bme->v1 == v) || (BM_edge_other_vert(bme, bme->v1) == v)) {
-			if (BM_edge_face_count(bme) == 2) {
+			if (BM_edge_is_manifold(bme)) {
 				BMO_elem_flag_enable(bm, bme, EDGE_SELECTED);
 				nsel++;
 			}
@@ -1295,7 +1295,7 @@
 	BMFace *f1, *f2, *f;
 	int k, nseg, i1, i2;
 
-	if (BM_edge_face_count(bme) != 2)
+	if (!BM_edge_is_manifold(bme))
 		return;
 
 	bv1 = find_bevvert(bp, bme->v1);
@@ -1592,7 +1592,7 @@
 			BMO_elem_flag_disable(bm, e->v2, BEVEL_DEL);
 		}
 #if 0
-		if (BM_edge_face_count(e) == 0) {
+		if (BM_edge_is_wire(e)) {
 			BMVert *verts[2] = {e->v1, e->v2};
 			BMEdge *edges[2] = {e, BM_edge_create(bm, e->v1, e->v2, e, 0)};
 			

Modified: trunk/blender/source/blender/bmesh/operators/bmo_hull.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_hull.c	2012-11-12 03:41:25 UTC (rev 52131)
+++ trunk/blender/source/blender/bmesh/operators/bmo_hull.c	2012-11-12 04:50:45 UTC (rev 52132)
@@ -385,7 +385,7 @@
 	BMO_ITER (f, &oiter, bm, op, "input", BM_FACE) {
 		if (BMO_elem_flag_test(bm, f, HULL_FLAG_HOLE)) {
 			BM_ITER_ELEM (e, &iter, f, BM_EDGES_OF_FACE) {
-				if (BM_edge_face_count(e) == 1) {
+				if (BM_edge_is_boundary(e)) {
 					BMO_elem_flag_disable(bm, f, HULL_FLAG_HOLE);
 					break;
 				}

Modified: trunk/blender/source/blender/bmesh/operators/bmo_symmetrize.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_symmetrize.c	2012-11-12 03:41:25 UTC (rev 52131)
+++ trunk/blender/source/blender/bmesh/operators/bmo_symmetrize.c	2012-11-12 04:50:45 UTC (rev 52132)
@@ -617,7 +617,7 @@
 		    !symmetric)
 		{
 			/* The edge might be used by a face outside the input set */
-			if (BM_edge_face_count(e) == 0)
+			if (BM_edge_is_wire(e))
 				BM_edge_kill(symm->bm, e);
 		}
 	}