[Bf-blender-cvs] [af8a449ca55] blender-v3.4-release: blender-v3.4-release: fix more merge discrepencies in pbvh.c

[Joseph Eagar]

Commit: af8a449ca55358bbf84611da2ec9b82b5b5d6664
Author: Joseph Eagar
Date:   Tue Nov 22 12:48:39 2022 -0800
Branches: blender-v3.4-release
https://developer.blender.org/rBaf8a449ca55358bbf84611da2ec9b82b5b5d6664

blender-v3.4-release: fix more merge discrepencies in pbvh.c

===================================================================

M	source/blender/blenkernel/intern/pbvh.c

===================================================================

diff --git a/source/blender/blenkernel/intern/pbvh.c b/source/blender/blenkernel/intern/pbvh.c
index 8fba781835f..7d7641a7a54 100644
--- a/source/blender/blenkernel/intern/pbvh.c
+++ b/source/blender/blenkernel/intern/pbvh.c
@@ -3572,7 +3572,7 @@ BLI_INLINE int face_iter_prim_to_face(PBVHFaceIter *fd, int prim_index)
   }
 }
 
-void pbvh_face_iter_step(PBVHFaceIter *fd, bool do_step)
+static void pbvh_face_iter_step(PBVHFaceIter *fd, bool do_step)
 {
   if (do_step) {
     fd->i++;
@@ -3677,7 +3677,6 @@ void BKE_pbvh_face_iter_init(PBVH *pbvh, PBVHNode *node, PBVHFaceIter *fd)
 
   fd->node_ = node;
   fd->pbvh_type_ = BKE_pbvh_type(pbvh);
-
   fd->verts = fd->verts_reserved_;
   fd->verts_size_ = PBVH_FACE_ITER_VERTS_RESERVED;