[Bf-blender-cvs] [f495939e6e2] master: Correct argument type for BKE_pbvh_node_get_bm_orco_data, format
Campbell Barton
noreply at git.blender.org
Tue Oct 11 02:06:51 CEST 2022
Commit: f495939e6e2cf8fdbc6055f5f98445a06ce31203
Author: Campbell Barton
Date: Tue Oct 11 11:05:01 2022 +1100
Branches: master
https://developer.blender.org/rBf495939e6e2cf8fdbc6055f5f98445a06ce31203
Correct argument type for BKE_pbvh_node_get_bm_orco_data, format
===================================================================
M source/blender/blenkernel/BKE_pbvh.h
M source/blender/blenkernel/intern/pbvh.c
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 48926a5c858..89743f1d2b4 100644
--- a/source/blender/blenkernel/BKE_pbvh.h
+++ b/source/blender/blenkernel/BKE_pbvh.h
@@ -669,7 +669,7 @@ void BKE_pbvh_node_get_bm_orco_data(PBVHNode *node,
int (**r_orco_tris)[3],
int *r_orco_tris_num,
float (**r_orco_coords)[3],
- struct BMVert **r_orco_verts);
+ struct BMVert ***r_orco_verts);
/**
* \note doing a full search on all vertices here seems expensive,
diff --git a/source/blender/blenkernel/intern/pbvh.c b/source/blender/blenkernel/intern/pbvh.c
index a41c7b5f0bb..b23fe53e80c 100644
--- a/source/blender/blenkernel/intern/pbvh.c
+++ b/source/blender/blenkernel/intern/pbvh.c
@@ -2045,7 +2045,7 @@ void BKE_pbvh_node_get_bm_orco_data(PBVHNode *node,
int (**r_orco_tris)[3],
int *r_orco_tris_num,
float (**r_orco_coords)[3],
- BMVert **r_orco_verts)
+ BMVert ***r_orco_verts)
{
*r_orco_tris = node->bm_ortri;
*r_orco_tris_num = node->bm_tot_ortri;
diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c
index 133d8c11a87..fdbb1f04c0c 100644
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@ -410,7 +410,7 @@ void SCULPT_face_visibility_all_invert(SculptSession *ss)
}
void SCULPT_face_visibility_all_set(SculptSession *ss, bool visible)
-{
+{
switch (BKE_pbvh_type(ss->pbvh)) {
case PBVH_FACES:
case PBVH_GRIDS:
More information about the Bf-blender-cvs
mailing list