code cleanup: replace bmesh_radial_face_find -> BM_edge_in_face

7 files changed, 16 insertions, 31 deletions

diff --git a/source/blender/bmesh/intern/bmesh_core.c b/source/blender/bmesh/intern/bmesh_core.c
index f9e711a0dc3..269a10749dc 100644
--- a/source/blender/bmesh/intern/bmesh_core.c
+++ b/source/blender/bmesh/intern/bmesh_core.c
@@ -1763,10 +1763,10 @@ BMFace *bmesh_jfke(BMesh *bm, BMFace *f1, BMFace *f2, BMEdge *e)
 
 	/* validate that for each face, each vertex has another edge in its disk cycle that is
 	 * not e, and not shared. */
-	if (bmesh_radial_face_find(l_f1->next->e, f2) ||
-	    bmesh_radial_face_find(l_f1->prev->e, f2) ||
-	    bmesh_radial_face_find(l_f2->next->e, f1) ||
-	    bmesh_radial_face_find(l_f2->prev->e, f1) )
+	if (BM_edge_in_face(l_f1->next->e, f2) ||
+	    BM_edge_in_face(l_f1->prev->e, f2) ||
+	    BM_edge_in_face(l_f2->next->e, f1) ||
+	    BM_edge_in_face(l_f2->prev->e, f1) )
 	{
 		return NULL;
 	}
diff --git a/source/blender/bmesh/intern/bmesh_queries.c b/source/blender/bmesh/intern/bmesh_queries.c
index 0e2984c53cc..a73cffac50e 100644
--- a/source/blender/bmesh/intern/bmesh_queries.c
+++ b/source/blender/bmesh/intern/bmesh_queries.c
@@ -336,7 +336,7 @@ bool BM_verts_in_face(BMFace *f, BMVert **varr, int len)
 /**
  * Returns whether or not a given edge is is part of a given face.
  */
-bool BM_edge_in_face(BMFace *f, BMEdge *e)
+bool BM_edge_in_face(BMEdge *e, BMFace *f)
 {
 	if (e->l) {
 		BMLoop *l_iter, *l_first;
@@ -884,15 +884,15 @@ bool BM_face_share_face_check(BMFace *f1, BMFace *f2)
 /**
  *  Counts the number of edges two faces share (if any)
  */
-int BM_face_share_edge_count(BMFace *f1, BMFace *f2)
+int BM_face_share_edge_count(BMFace *f_a, BMFace *f_b)
 {
 	BMLoop *l_iter;
 	BMLoop *l_first;
 	int count = 0;
 	
-	l_iter = l_first = BM_FACE_FIRST_LOOP(f1);
+	l_iter = l_first = BM_FACE_FIRST_LOOP(f_a);
 	do {
-		if (bmesh_radial_face_find(l_iter->e, f2)) {
+		if (BM_edge_in_face(l_iter->e, f_b)) {
 			count++;
 		}
 	} while ((l_iter = l_iter->next) != l_first);
@@ -910,7 +910,7 @@ bool BM_face_share_edge_check(BMFace *f1, BMFace *f2)
 
 	l_iter = l_first = BM_FACE_FIRST_LOOP(f1);
 	do {
-		if (bmesh_radial_face_find(l_iter->e, f2)) {
+		if (BM_edge_in_face(l_iter->e, f2)) {
 			return true;
 		}
 	} while ((l_iter = l_iter->next) != l_first);
@@ -930,7 +930,7 @@ bool BM_edge_share_face_check(BMEdge *e1, BMEdge *e2)
 		l = e1->l;
 		do {
 			f = l->f;
-			if (bmesh_radial_face_find(e2, f)) {
+			if (BM_edge_in_face(e2, f)) {
 				return true;
 			}
 			l = l->radial_next;
@@ -952,7 +952,7 @@ bool BM_edge_share_quad_check(BMEdge *e1, BMEdge *e2)
 		do {
 			f = l->f;
 			if (f->len == 4) {
-				if (bmesh_radial_face_find(e2, f)) {
+				if (BM_edge_in_face(e2, f)) {
 					return true;
 				}
 			}
diff --git a/source/blender/bmesh/intern/bmesh_queries.h b/source/blender/bmesh/intern/bmesh_queries.h
index 151d1de9b5b..25f0d773b72 100644
--- a/source/blender/bmesh/intern/bmesh_queries.h
+++ b/source/blender/bmesh/intern/bmesh_queries.h
@@ -33,7 +33,7 @@ bool    BM_vert_in_face(BMFace *f, BMVert *v);
 int     BM_verts_in_face_count(BMFace *f, BMVert **varr, int len);
 bool    BM_verts_in_face(BMFace *f, BMVert **varr, int len);
 
-bool    BM_edge_in_face(BMFace *f, BMEdge *e);
+bool    BM_edge_in_face(BMEdge *e, BMFace *f);
 bool    BM_edge_in_loop(BMEdge *e, BMLoop *l);
 
 bool    BM_vert_in_edge(const BMEdge *e, const BMVert *v);
@@ -95,7 +95,7 @@ bool    BM_face_exists(BMVert **varr, int len, BMFace **r_existface);
 bool    BM_face_exists_multi(BMVert **varr, BMEdge **earr, int len);
 bool    BM_face_exists_multi_edge(BMEdge **earr, int len);
 
-int     BM_face_share_face_count(BMFace *f1, BMFace *f2);
+int     BM_face_share_face_count(BMFace *f_a, BMFace *f_b);
 int     BM_face_share_edge_count(BMFace *f1, BMFace *f2);
 
 bool    BM_face_share_face_check(BMFace *f1, BMFace *f2);
diff --git a/source/blender/bmesh/intern/bmesh_structure.c b/source/blender/bmesh/intern/bmesh_structure.c
index a0907f0db7a..2e060a4edf5 100644
--- a/source/blender/bmesh/intern/bmesh_structure.c
+++ b/source/blender/bmesh/intern/bmesh_structure.c
@@ -130,7 +130,6 @@ bool bmesh_edge_swapverts(BMEdge *e, BMVert *v_orig, BMVert *v_new)
  * Functions relating to this cycle:
  * - #bmesh_radial_append
  * - #bmesh_radial_loop_remove
- * - #bmesh_radial_face_find
  * - #bmesh_radial_facevert_count
  * - #bmesh_radial_faceloop_find_first
  * - #bmesh_radial_faceloop_find_next
@@ -509,19 +508,6 @@ void bmesh_radial_append(BMEdge *e, BMLoop *l)
 	l->e = e;
 }
 
-bool bmesh_radial_face_find(BMEdge *e, BMFace *f)
-{
-	BMLoop *l_iter;
-	int i, len;
-
-	len = bmesh_radial_length(e->l);
-	for (i = 0, l_iter = e->l; i < len; i++, l_iter = l_iter->radial_next) {
-		if (l_iter->f == f)
-			return true;
-	}
-	return false;
-}
-
 /**
  * \brief RADIAL COUNT FACE VERT
  *
diff --git a/source/blender/bmesh/intern/bmesh_structure.h b/source/blender/bmesh/intern/bmesh_structure.h
index f10e3a12377..82bf10fe0ef 100644
--- a/source/blender/bmesh/intern/bmesh_structure.h
+++ b/source/blender/bmesh/intern/bmesh_structure.h
@@ -60,7 +60,6 @@ void    bmesh_radial_loop_remove(BMLoop *l, BMEdge *e);
  *      bmesh_radial_loop_next(BMLoop *l) / prev.
  * just use member access l->radial_next, l->radial_prev now */
 
-bool    bmesh_radial_face_find(BMEdge *e, BMFace *f);
 int     bmesh_radial_facevert_count(BMLoop *l, BMVert *v);
 BMLoop *bmesh_radial_faceloop_find_first(BMLoop *l, BMVert *v);
 BMLoop *bmesh_radial_faceloop_find_next(BMLoop *l, BMVert *v);
diff --git a/source/blender/editors/mesh/editmesh_loopcut.c b/source/blender/editors/mesh/editmesh_loopcut.c
index 3c1b210d171..892b773b1ba 100644
--- a/source/blender/editors/mesh/editmesh_loopcut.c
+++ b/source/blender/editors/mesh/editmesh_loopcut.c
@@ -125,9 +125,9 @@ static void edgering_find_order(BMEdge *lasteed, BMEdge *eed,
 	l = eed->l;
 
 	/* find correct order for v[1] */
-	if (!(BM_edge_in_face(l->f, eed) && BM_edge_in_face(l->f, lasteed))) {
+	if (!(BM_edge_in_face(eed, l->f) && BM_edge_in_face(lasteed, l->f))) {
 		BM_ITER_ELEM (l, &liter, l, BM_LOOPS_OF_LOOP) {
-			if (BM_edge_in_face(l->f, eed) && BM_edge_in_face(l->f, lasteed))
+			if (BM_edge_in_face(eed, l->f) && BM_edge_in_face(lasteed, l->f))
 				break;
 		}
 	}
diff --git a/source/blender/editors/mesh/editmesh_utils.c b/source/blender/editors/mesh/editmesh_utils.c
index 44cc89cb23c..46cab3b4416 100644
--- a/source/blender/editors/mesh/editmesh_utils.c
+++ b/source/blender/editors/mesh/editmesh_utils.c
@@ -1483,7 +1483,7 @@ static BMFace *edge_ray_cast(struct BMBVHTree *tree, const float co[3], const fl
 {
 	BMFace *f = BKE_bmbvh_ray_cast(tree, co, dir, NULL, r_hitout, NULL);
 
-	if (f && BM_edge_in_face(f, e))
+	if (f && BM_edge_in_face(e, f))
 		return NULL;
 
 	return f;