[Bf-blender-cvs] [b0e38f4d043] master: Cleanup: Strict compiler warnings

[Sergey Sharybin]

Commit: b0e38f4d04331a20b88e6c058641ae2491060028
Author: Sergey Sharybin
Date:   Mon Nov 21 16:57:46 2022 +0100
Branches: master
https://developer.blender.org/rBb0e38f4d04331a20b88e6c058641ae2491060028

Cleanup: Strict compiler warnings

Remove `private:` from the PBVHFaceIter. This is not really a C++
class, and the C++ code generates a lot of warnings about unused
fields.

Also mark function static and run clang-format.

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

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

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

diff --git a/source/blender/blenkernel/BKE_pbvh.h b/source/blender/blenkernel/BKE_pbvh.h
index 757a2e0f396..1c2e4193596 100644
--- a/source/blender/blenkernel/BKE_pbvh.h
+++ b/source/blender/blenkernel/BKE_pbvh.h
@@ -685,11 +685,6 @@ typedef struct PBVHFaceIter {
   PBVHVertRef *verts;
   int verts_num;
 
-  /* Private. */
-#ifdef __cplusplus
- private:
-#endif
-
   PBVHVertRef verts_reserved_[PBVH_FACE_ITER_VERTS_RESERVED];
   const PBVHNode *node_;
   PBVHType pbvh_type_;
diff --git a/source/blender/blenkernel/intern/pbvh.c b/source/blender/blenkernel/intern/pbvh.c
index c2299f2a4ea..ac4c1e94c1c 100644
--- a/source/blender/blenkernel/intern/pbvh.c
+++ b/source/blender/blenkernel/intern/pbvh.c
@@ -841,7 +841,7 @@ void BKE_pbvh_build_grids(PBVH *pbvh,
   for (int i = 0; i < me->totpoly; i++) {
     max_grids = max_ii(max_grids, mpoly[i].totloop);
   }
-  
+
   /* Ensure leaf limit is at least 4 so there's room
    * to split at original face boundaries.
    * Fixes T102209.
@@ -3151,7 +3151,6 @@ void BKE_pbvh_vert_coords_apply(PBVH *pbvh, const float (*vertCos)[3], const int
       }
     }
 
-
     for (int a = 0; a < pbvh->totnode; a++) {
       BKE_pbvh_node_mark_update(&pbvh->nodes[a]);
     }
@@ -3548,7 +3547,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++;