[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59213] trunk/blender/source/blender/bmesh /intern/bmesh_queries.c: bmesh api internal changes

[Campbell Barton]

Revision: 59213
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59213
Author:   campbellbarton
Date:     2013-08-17 13:32:56 +0000 (Sat, 17 Aug 2013)
Log Message:
-----------
bmesh api internal changes
- optimize BM_face_exists_overlap_subset(), dont check faces smaller then the vert array, don't initialize overlap flag unless its needed.
- BM_face_exists_overlap had incorrect check (currently function is unused so no harm done)

Modified Paths:
--------------
    trunk/blender/source/blender/bmesh/intern/bmesh_queries.c

Modified: trunk/blender/source/blender/bmesh/intern/bmesh_queries.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_queries.c	2013-08-17 13:22:21 UTC (rev 59212)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_queries.c	2013-08-17 13:32:56 UTC (rev 59213)
@@ -1454,8 +1454,7 @@
  * there is a face with exactly those vertices
  * (and only those vertices).
  *
- * \note there used to be a BM_face_exists_overlap function that checked for partial overlap,
- * however this is no longer used, simple to add back.
+ * \note there used to be a BM_face_exists_overlap function that checks for partial overlap.
  */
 bool BM_face_exists(BMVert **varr, int len, BMFace **r_existface)
 {
@@ -1690,11 +1689,15 @@
  * Given a set of vertices (varr), find out if
  * all those vertices overlap an existing face.
  *
- * \return Success
+ * \note The face may contain other verts \b not in \a varr.
  *
+ * \note Its possible there are more then one overlapping faces,
+ * in this case the first one found will be assigned to \a r_f_overlap.
+ *
  * \param varr  Array of unordered verts.
  * \param len  \a varr array length.
  * \param r_f_overlap  The overlapping face to return.
+ * \return Success
  */
 
 bool BM_face_exists_overlap(BMVert **varr, const int len, BMFace **r_f_overlap)
@@ -1721,7 +1724,7 @@
 	for(i = 0; i < len; i++) {
 		BM_ITER_ELEM (f, &viter, varr[i], BM_FACES_OF_VERT) {
 			if (BM_ELEM_API_FLAG_TEST(f, _FLAG_OVERLAP) == 0) {
-				if (len <= BM_verts_in_face(f, varr, len)) {
+				if (len <= BM_verts_in_face_count(f, varr, len)) {
 					if (r_f_overlap)
 						*r_f_overlap = f;
 
@@ -1755,6 +1758,7 @@
 	BMIter viter;
 	BMFace *f;
 	int i;
+	bool is_init = false;
 	bool is_overlap = false;
 	LinkNode *f_lnk = NULL;
 
@@ -1769,14 +1773,18 @@
 #endif
 
 	for(i = 0; i < len; i++) {
-		BM_ELEM_API_FLAG_ENABLE(varr[i], _FLAG_OVERLAP);
-	}
-
-	for(i = 0; i < len; i++) {
 		BM_ITER_ELEM (f, &viter, varr[i], BM_FACES_OF_VERT) {
-			if (BM_ELEM_API_FLAG_TEST(f, _FLAG_OVERLAP) == 0) {
+			if ((f->len <= len) && (BM_ELEM_API_FLAG_TEST(f, _FLAG_OVERLAP) == 0)) {
 				/* check if all vers in this face are flagged*/
 				BMLoop *l_iter, *l_first;
+
+				if (is_init == false) {
+					is_init = true;
+					for(i = 0; i < len; i++) {
+						BM_ELEM_API_FLAG_ENABLE(varr[i], _FLAG_OVERLAP);
+					}
+				}
+
 				l_iter = l_first = BM_FACE_FIRST_LOOP(f);
 				is_overlap = true;
 				do {
@@ -1796,8 +1804,10 @@
 		}
 	}
 
-	for(i = 0; i < len; i++) {
-		BM_ELEM_API_FLAG_DISABLE(varr[i], _FLAG_OVERLAP);
+	if (is_init == true) {
+		for(i = 0; i < len; i++) {
+			BM_ELEM_API_FLAG_DISABLE(varr[i], _FLAG_OVERLAP);
+		}
 	}
 
 	for (; f_lnk; f_lnk = f_lnk->next) {