Commit: d5cfe4383e7868e454dc54a9dec70185d61c9848 Author: Hans Goudey Date: Sun Feb 5 17:44:29 2023 -0500 Branches: refactor-mesh-corners-generic https://developer.blender.org/rBd5cfe4383e7868e454dc54a9dec70185d61c9848
Merge branch 'master' into refactor-mesh-corners-generic =================================================================== =================================================================== diff --cc source/blender/blenkernel/intern/pbvh.cc index c2bdfec8094,1f3583a7f7e..ddfe4f52606 --- a/source/blender/blenkernel/intern/pbvh.cc +++ b/source/blender/blenkernel/intern/pbvh.cc @@@ -811,12 -812,12 +813,12 @@@ static void pbvh_validate_node_prims(PB void BKE_pbvh_build_mesh(PBVH *pbvh, Mesh *mesh, const MPoly *mpoly, - const MLoop *mloop, + const int *corner_verts, float (*vert_positions)[3], int totvert, - struct CustomData *vdata, - struct CustomData *ldata, - struct CustomData *pdata, + CustomData *vdata, + CustomData *ldata, + CustomData *pdata, const MLoopTri *looptri, int looptri_num) { @@@ -826,11 -827,11 +828,11 @@@ pbvh->mesh = mesh; pbvh->header.type = PBVH_FACES; pbvh->mpoly = mpoly; - pbvh->hide_poly = (bool *)CustomData_get_layer_named_for_write( - &mesh->pdata, CD_PROP_BOOL, ".hide_poly", mesh->totpoly); - pbvh->material_indices = (const int *)CustomData_get_layer_named( - &mesh->pdata, CD_PROP_INT32, "material_index"); + pbvh->hide_poly = static_cast<bool *>(CustomData_get_layer_named_for_write( + &mesh->pdata, CD_PROP_BOOL, ".hide_poly", mesh->totpoly)); + pbvh->material_indices = static_cast<const int *>( + CustomData_get_layer_named(&mesh->pdata, CD_PROP_INT32, "material_index")); - pbvh->mloop = mloop; + pbvh->corner_verts = corner_verts; pbvh->looptri = looptri; pbvh->vert_positions = vert_positions; BKE_mesh_vertex_normals_ensure(mesh); diff --cc source/blender/blenkernel/intern/pbvh_intern.hh index 892a3abee32,d41eeb0b70b..7757275f6de --- a/source/blender/blenkernel/intern/pbvh_intern.hh +++ b/source/blender/blenkernel/intern/pbvh_intern.hh @@@ -8,24 -6,21 +6,20 @@@ * \ingroup bke */ - #ifdef __cplusplus - extern "C" { - #endif - + struct PBVHGPUFormat; -struct MLoop; struct MLoopTri; struct MPoly; + struct MeshElemMap; /* Axis-aligned bounding box */ - typedef struct { + struct BB { float bmin[3], bmax[3]; - } BB; + }; /* Axis-aligned bounding box with centroid */ - typedef struct { + struct BBC { float bmin[3], bmax[3], bcentroid[3]; - } BBC; - - struct MeshElemMap; + }; /* NOTE: this structure is getting large, might want to split it into * union'd structs */ @@@ -163,8 -161,8 +160,8 @@@ struct PBVH bool *hide_poly; /** Material indices. Only valid for polygon meshes. */ const int *material_indices; - const MLoop *mloop; + const int *corner_verts; - const struct MLoopTri *looptri; + const MLoopTri *looptri; CustomData *vdata; CustomData *ldata; CustomData *pdata; _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs