BMesh: BM_face_exists no longer uses return arg

Just return the face or NULL, like BM_edge_exists(),
Also for BM_face_exists_overlap & bm_face_exists_tri_from_loop_vert.
No functional changes.

Old code did some partial overlap checks where this made some sense,
but it's since been removed.

1 files changed, 7 insertions, 10 deletions

diff --git a/source/blender/blenkernel/intern/pbvh_bmesh.c b/source/blender/blenkernel/intern/pbvh_bmesh.c
index 55f9f384081..a821578db1a 100644
--- a/source/blender/blenkernel/intern/pbvh_bmesh.c
+++ b/source/blender/blenkernel/intern/pbvh_bmesh.c
@@ -148,8 +148,7 @@ BLI_INLINE void bm_face_as_array_index_tri(BMFace *f, int r_index[3])
  *
  * Its assumed that \a l_radial_first is never forming the target face.
  */
-static bool bm_face_exists_tri_from_loop_vert(
-        BMLoop *l_radial_first, BMVert *v_opposite, BMFace **r_face_existing)
+static BMFace *bm_face_exists_tri_from_loop_vert(BMLoop *l_radial_first, BMVert *v_opposite)
 {
 	BLI_assert(!ELEM(v_opposite, l_radial_first->v, l_radial_first->next->v, l_radial_first->prev->v));
 	if (l_radial_first->radial_next != l_radial_first) {
@@ -157,12 +156,11 @@ static bool bm_face_exists_tri_from_loop_vert(
 		do {
 			BLI_assert(l_radial_iter->f->len == 3);
 			if (l_radial_iter->prev->v == v_opposite) {
-				*r_face_existing = l_radial_iter->f;
-				return true;
+				return l_radial_iter->f;
 			}
 		} while ((l_radial_iter = l_radial_iter->radial_next) != l_radial_first);
 	}
-	return false;
+	return NULL;
 }
 
 /**
@@ -519,7 +517,7 @@ static BMFace *pbvh_bmesh_face_create(
 	PBVHNode *node = &bvh->nodes[node_index];
 
 	/* ensure we never add existing face */
-	BLI_assert(BM_face_exists(v_tri, 3, NULL) == false);
+	BLI_assert(!BM_face_exists(v_tri, 3));
 
 	BMFace *f = BM_face_create(bvh->bm, v_tri, e_tri, 3, f_example, BM_CREATE_NOP);
 	f->head.hflag = f_example->head.hflag;
@@ -1313,18 +1311,17 @@ static void pbvh_bmesh_collapse_edge(
 		 * deletion as well. Prevents extraneous "flaps" from being
 		 * created. */
 #if 0
-		if (UNLIKELY(BM_face_exists(v_tri, 3, &existing_face)))
+		if (UNLIKELY(existing_face = BM_face_exists(v_tri, 3)))
 #else
-		if (UNLIKELY(bm_face_exists_tri_from_loop_vert(l->next, v_conn, &existing_face)))
+		if (UNLIKELY(existing_face = bm_face_exists_tri_from_loop_vert(l->next, v_conn)))
 #endif
 		{
-			BLI_assert(existing_face);
 			BLI_buffer_append(deleted_faces, BMFace *, existing_face);
 		}
 		else {
 			BMVert *v_tri[3] = {v_conn, l->next->v, l->prev->v};
 
-			BLI_assert(BM_face_exists(v_tri, 3, NULL) == false);
+			BLI_assert(!BM_face_exists(v_tri, 3));
 			BMEdge *e_tri[3];
 			PBVHNode *n = pbvh_bmesh_node_from_face(bvh, f);
 			int ni = n - bvh->nodes;