[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44470] trunk/blender/source/blender: bmesh api name change, add _count suffix for BM_*_share functions.

Campbell Barton ideasman42 at gmail.com
Sun Feb 26 20:46:13 CET 2012


Revision: 44470
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44470
Author:   campbellbarton
Date:     2012-02-26 19:46:12 +0000 (Sun, 26 Feb 2012)
Log Message:
-----------
bmesh api name change, add _count suffix for BM_*_share functions.

Modified Paths:
--------------
    trunk/blender/source/blender/bmesh/bmesh_queries.h
    trunk/blender/source/blender/bmesh/intern/bmesh_mods.c
    trunk/blender/source/blender/bmesh/intern/bmesh_newcore.c
    trunk/blender/source/blender/bmesh/intern/bmesh_queries.c
    trunk/blender/source/blender/bmesh/operators/bmo_create.c
    trunk/blender/source/blender/bmesh/operators/bmo_subdivide.c
    trunk/blender/source/blender/bmesh/tools/BME_bevel.c
    trunk/blender/source/blender/editors/mesh/loopcut.c

Modified: trunk/blender/source/blender/bmesh/bmesh_queries.h
===================================================================
--- trunk/blender/source/blender/bmesh/bmesh_queries.h	2012-02-26 18:12:01 UTC (rev 44469)
+++ trunk/blender/source/blender/bmesh/bmesh_queries.h	2012-02-26 19:46:12 UTC (rev 44470)
@@ -102,13 +102,13 @@
 
 
 /* returns number of edges f1 and f2 share. */
-int BM_face_share_edges(struct BMFace *f1, struct BMFace *f2);
+int BM_face_share_edge_count(struct BMFace *f1, struct BMFace *f2);
 
 /* returns number of faces e1 and e2 share. */
-int BM_edge_share_faces(struct BMEdge *e1, struct BMEdge *e2);
+int BM_edge_share_face_count(struct BMEdge *e1, struct BMEdge *e2);
 
 /* returns bool 1/0 if the edges share a vertex */
-int BM_edge_share_vert(struct BMEdge *e1, struct BMEdge *e2);
+int BM_edge_share_vert_count(struct BMEdge *e1, struct BMEdge *e2);
 
 /* edge verts in winding order from face */
 void BM_edge_ordered_verts(struct BMEdge *edge, struct BMVert **r_v1, struct BMVert **r_v2);

Modified: trunk/blender/source/blender/bmesh/intern/bmesh_mods.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_mods.c	2012-02-26 18:12:01 UTC (rev 44469)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_mods.c	2012-02-26 19:46:12 UTC (rev 44470)
@@ -108,7 +108,7 @@
 		e = v->e;
 		do {
 			e = bmesh_disk_nextedge(e, v);
-			if (!(BM_edge_share_faces(e, v->e))) {
+			if (!(BM_edge_share_face_count(e, v->e))) {
 				keepedge = e;
 				baseedge = v->e;
 				break;

Modified: trunk/blender/source/blender/bmesh/intern/bmesh_newcore.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_newcore.c	2012-02-26 18:12:01 UTC (rev 44469)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_newcore.c	2012-02-26 19:46:12 UTC (rev 44470)
@@ -1650,7 +1650,7 @@
 	}
 
 	/* validate only one shared edg */
-	shared = BM_face_share_edges(f1, f2);
+	shared = BM_face_share_edge_count(f1, f2);
 	if (shared > 1) {
 		return NULL;
 	}

Modified: trunk/blender/source/blender/bmesh/intern/bmesh_queries.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_queries.c	2012-02-26 18:12:01 UTC (rev 44469)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_queries.c	2012-02-26 19:46:12 UTC (rev 44470)
@@ -450,7 +450,7 @@
  *	Integer
  */
 
-int BM_face_share_edges(BMFace *f1, BMFace *f2)
+int BM_face_share_edge_count(BMFace *f1, BMFace *f2)
 {
 	BMLoop *l_iter;
 	BMLoop *l_first;
@@ -474,7 +474,7 @@
  *
  */
 
-int BM_edge_share_faces(BMEdge *e1, BMEdge *e2)
+int BM_edge_share_face_count(BMEdge *e1, BMEdge *e2)
 {
 	BMLoop *l;
 	BMFace *f;
@@ -500,7 +500,7 @@
  *
  */
 
-int BM_edge_share_vert(struct BMEdge *e1, struct BMEdge *e2)
+int BM_edge_share_vert_count(struct BMEdge *e1, struct BMEdge *e2)
 {
 	return (e1->v1 == e2->v1 ||
 	        e1->v1 == e2->v2 ||

Modified: trunk/blender/source/blender/bmesh/operators/bmo_create.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_create.c	2012-02-26 18:12:01 UTC (rev 44469)
+++ trunk/blender/source/blender/bmesh/operators/bmo_create.c	2012-02-26 19:46:12 UTC (rev 44470)
@@ -1140,10 +1140,10 @@
 	}
 
 	if (edges1 && BLI_array_count(edges1) > 2 &&
-	    BM_edge_share_vert(edges1[0], edges1[BLI_array_count(edges1) - 1]))
+	    BM_edge_share_vert_count(edges1[0], edges1[BLI_array_count(edges1) - 1]))
 	{
 		if (edges2 && BLI_array_count(edges2) > 2 &&
-		    BM_edge_share_vert(edges2[0], edges2[BLI_array_count(edges2) - 1]))
+		    BM_edge_share_vert_count(edges2[0], edges2[BLI_array_count(edges2) - 1]))
 		{
 			BLI_array_free(edges1);
 			BLI_array_free(edges2);
@@ -1156,7 +1156,7 @@
 	}
 
 	if (edges2 && BLI_array_count(edges2) > 2 &&
-	    BM_edge_share_vert(edges2[0], edges2[BLI_array_count(edges2) - 1]))
+	    BM_edge_share_vert_count(edges2[0], edges2[BLI_array_count(edges2) - 1]))
 	{
 		edges2 = NULL;
 	}

Modified: trunk/blender/source/blender/bmesh/operators/bmo_subdivide.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_subdivide.c	2012-02-26 18:12:01 UTC (rev 44469)
+++ trunk/blender/source/blender/bmesh/operators/bmo_subdivide.c	2012-02-26 19:46:12 UTC (rev 44470)
@@ -792,7 +792,7 @@
 		}
 
 		/* make sure the two edges have a valid angle to each othe */
-		if (totesel == 2 && BM_edge_share_vert(e1, e2)) {
+		if (totesel == 2 && BM_edge_share_vert_count(e1, e2)) {
 			float angle;
 
 			sub_v3_v3v3(vec1, e1->v2->co, e1->v1->co);

Modified: trunk/blender/source/blender/bmesh/tools/BME_bevel.c
===================================================================
--- trunk/blender/source/blender/bmesh/tools/BME_bevel.c	2012-02-26 18:12:01 UTC (rev 44469)
+++ trunk/blender/source/blender/bmesh/tools/BME_bevel.c	2012-02-26 19:46:12 UTC (rev 44470)
@@ -829,7 +829,7 @@
 	/* clean up edges with 2 faces that share more than one edg */
 	BM_ITER(e, &iter, bm, BM_EDGES_OF_MESH, NULL) {
 		if(BMO_elem_flag_test(bm, e, BME_BEVEL_BEVEL)) {
-			count = BM_face_share_edges(e->l->f, e->l->radial_next->f);
+			count = BM_face_share_edge_count(e->l->f, e->l->radial_next->f);
 			if(count > 1) BMO_elem_flag_disable(bm, e, BME_BEVEL_BEVEL);
 		}
 	}

Modified: trunk/blender/source/blender/editors/mesh/loopcut.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/loopcut.c	2012-02-26 18:12:01 UTC (rev 44469)
+++ trunk/blender/source/blender/editors/mesh/loopcut.c	2012-02-26 19:46:12 UTC (rev 44470)
@@ -255,7 +255,7 @@
 		lasteed = eed;
 	}
 	
-	if (lasteed != startedge && BM_edge_share_faces(lasteed, startedge)) {
+	if (lasteed != startedge && BM_edge_share_face_count(lasteed, startedge)) {
 		v[1][0] = v[0][0];
 		v[1][1] = v[0][1];
 




More information about the Bf-blender-cvs mailing list