[Bf-blender-cvs] [560614c0dc4] temp-T96710-pbvh-pixels: Cleanup unused parameters.

Jeroen Bakker noreply at git.blender.org
Fri Apr 1 12:56:53 CEST 2022


Commit: 560614c0dc4dd3cc50b4891a4c830ef4e9d67a8d
Author: Jeroen Bakker
Date:   Fri Apr 1 12:56:49 2022 +0200
Branches: temp-T96710-pbvh-pixels
https://developer.blender.org/rB560614c0dc4dd3cc50b4891a4c830ef4e9d67a8d

Cleanup unused parameters.

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

M	source/blender/blenkernel/BKE_pbvh.h
M	source/blender/blenkernel/intern/pbvh_pixels.cc
M	source/blender/editors/sculpt_paint/sculpt.c

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

diff --git a/source/blender/blenkernel/BKE_pbvh.h b/source/blender/blenkernel/BKE_pbvh.h
index 82dc7880668..54af9374d47 100644
--- a/source/blender/blenkernel/BKE_pbvh.h
+++ b/source/blender/blenkernel/BKE_pbvh.h
@@ -138,12 +138,7 @@ void BKE_pbvh_build_pixels(PBVH *pbvh,
                            const struct MeshElemMap *pmap,
                            const struct MPoly *mpoly,
                            const struct MLoop *mloop,
-                           struct MVert *verts,
-                           int totvert,
-                           struct CustomData *vdata,
                            struct CustomData *ldata,
-                           struct CustomData *pdata,
-                           const struct MLoopTri *looptri,
                            int totpoly,
                            struct Image *image,
                            struct ImageUser *image_user);
diff --git a/source/blender/blenkernel/intern/pbvh_pixels.cc b/source/blender/blenkernel/intern/pbvh_pixels.cc
index 82cde7f94bf..92912797f89 100644
--- a/source/blender/blenkernel/intern/pbvh_pixels.cc
+++ b/source/blender/blenkernel/intern/pbvh_pixels.cc
@@ -189,12 +189,7 @@ static void init(PBVH *pbvh,
                  const MeshElemMap *pmap,
                  const struct MPoly *mpoly,
                  const struct MLoop *mloop,
-                 struct MVert *verts,
-                 int totvert,
-                 struct CustomData *vdata,
                  struct CustomData *ldata,
-                 struct CustomData *pdata,
-                 const struct MLoopTri *looptri,
                  int tot_poly,
                  struct Image *image,
                  struct ImageUser *image_user)
@@ -342,29 +337,12 @@ void BKE_pbvh_build_pixels(PBVH *pbvh,
                            const struct MeshElemMap *pmap,
                            const struct MPoly *mpoly,
                            const struct MLoop *mloop,
-                           struct MVert *verts,
-                           int totvert,
-                           struct CustomData *vdata,
                            struct CustomData *ldata,
-                           struct CustomData *pdata,
-                           const struct MLoopTri *looptri,
                            int tot_poly,
                            struct Image *image,
                            struct ImageUser *image_user)
 {
-  init(pbvh,
-       pmap,
-       mpoly,
-       mloop,
-       verts,
-       totvert,
-       vdata,
-       ldata,
-       pdata,
-       looptri,
-       tot_poly,
-       image,
-       image_user);
+  init(pbvh, pmap, mpoly, mloop, ldata, tot_poly, image, image_user);
 }
 
 void pbvh_pixels_free(PBVHNode *node)
diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c
index 0565faee77d..d45ec80001e 100644
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@ -2770,12 +2770,7 @@ static void sculpt_pbvh_update_pixels(SculptSession *ss, Object *ob)
                         ss->pmap,
                         mesh->mpoly,
                         mesh->mloop,
-                        mesh->mvert,
-                        mesh->totvert,
-                        &mesh->vdata,
                         &mesh->ldata,
-                        &mesh->pdata,
-                        NULL, /* looptri */
                         mesh->totpoly,
                         image,
                         image_user);



More information about the Bf-blender-cvs mailing list