From af8a449ca55358bbf84611da2ec9b82b5b5d6664 Mon Sep 17 00:00:00 2001 From: Joseph Eagar Date: Tue, 22 Nov 2022 12:48:39 -0800 Subject: [PATCH] blender-v3.4-release: fix more merge discrepencies in pbvh.c --- source/blender/blenkernel/intern/pbvh.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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;