Commit: dc99c09daadadaf4828d863105b35dcc19b54846 Author: Hans Goudey Date: Fri Jan 13 14:50:59 2023 -0600 Branches: master https://developer.blender.org/rBdc99c09daadadaf4828d863105b35dcc19b54846
Cleanup: Use const when accessing custom data layers =================================================================== M source/blender/blenkernel/BKE_particle.h M source/blender/blenkernel/intern/data_transfer.cc M source/blender/blenkernel/intern/data_transfer_intern.h M source/blender/blenkernel/intern/deform.c M source/blender/blenkernel/intern/particle.cc M source/blender/draw/DRW_pbvh.h M source/blender/draw/intern/draw_cache_impl_particles.c M source/blender/draw/intern/draw_pbvh.cc M source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_tan.cc M source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_uv.cc M source/blender/editors/mesh/meshtools.cc M source/blender/editors/physics/particle_edit.c M source/blender/editors/physics/particle_object.c M source/blender/editors/sculpt_paint/sculpt_face_set.cc M source/blender/editors/space_spreadsheet/spreadsheet_data_source_geometry.cc M source/blender/io/alembic/exporter/abc_writer_mesh.cc M source/blender/io/usd/intern/usd_writer_mesh.cc M source/blender/makesrna/intern/rna_particle.c M source/blender/render/intern/bake.cc =================================================================== diff --git a/source/blender/blenkernel/BKE_particle.h b/source/blender/blenkernel/BKE_particle.h index 5cf0eced72e..fc9769a94a4 100644 --- a/source/blender/blenkernel/BKE_particle.h +++ b/source/blender/blenkernel/BKE_particle.h @@ -584,7 +584,7 @@ void psys_get_texture(struct ParticleSimulationData *sim, void psys_interpolate_face(struct Mesh *mesh, const float (*vert_positions)[3], const float (*vert_normals)[3], - struct MFace *mface, + const struct MFace *mface, struct MTFace *tface, const float (*orcodata)[3], float w[4], diff --git a/source/blender/blenkernel/intern/data_transfer.cc b/source/blender/blenkernel/intern/data_transfer.cc index b3b8d4730bb..48dd0c84a54 100644 --- a/source/blender/blenkernel/intern/data_transfer.cc +++ b/source/blender/blenkernel/intern/data_transfer.cc @@ -512,7 +512,7 @@ static bool data_transfer_layersmapping_cdlayers_multisrc_to_dst(ListBase *r_map const int num_elem_dst, const bool use_create, const bool use_delete, - CustomData *cd_src, + const CustomData *cd_src, CustomData *cd_dst, const bool use_dupref_dst, const int tolayers, diff --git a/source/blender/blenkernel/intern/data_transfer_intern.h b/source/blender/blenkernel/intern/data_transfer_intern.h index defa87e899b..8335f21d0ad 100644 --- a/source/blender/blenkernel/intern/data_transfer_intern.h +++ b/source/blender/blenkernel/intern/data_transfer_intern.h @@ -46,7 +46,7 @@ bool data_transfer_layersmapping_vgroups(struct ListBase *r_map, bool use_delete, struct Object *ob_src, struct Object *ob_dst, - struct CustomData *cd_src, + const struct CustomData *cd_src, struct CustomData *cd_dst, bool use_dupref_dst, int fromlayers, diff --git a/source/blender/blenkernel/intern/deform.c b/source/blender/blenkernel/intern/deform.c index b5c3147b0f1..c2e5434f0e1 100644 --- a/source/blender/blenkernel/intern/deform.c +++ b/source/blender/blenkernel/intern/deform.c @@ -1217,7 +1217,7 @@ static bool data_transfer_layersmapping_vgroups_multisrc_to_dst(ListBase *r_map, Object *ob_dst, const MDeformVert *data_src, MDeformVert *data_dst, - CustomData *UNUSED(cd_src), + const CustomData *UNUSED(cd_src), CustomData *cd_dst, const bool UNUSED(use_dupref_dst), const int tolayers, @@ -1365,7 +1365,7 @@ bool data_transfer_layersmapping_vgroups(ListBase *r_map, const bool use_delete, Object *ob_src, Object *ob_dst, - CustomData *cd_src, + const CustomData *cd_src, CustomData *cd_dst, const bool use_dupref_dst, const int fromlayers, diff --git a/source/blender/blenkernel/intern/particle.cc b/source/blender/blenkernel/intern/particle.cc index 484cb343a97..f871aa324be 100644 --- a/source/blender/blenkernel/intern/particle.cc +++ b/source/blender/blenkernel/intern/particle.cc @@ -1702,7 +1702,7 @@ static void interpolate_pathcache(ParticleCacheKey *first, float t, ParticleCach void psys_interpolate_face(Mesh *mesh, const float (*vert_positions)[3], const float (*vert_normals)[3], - MFace *mface, + const MFace *mface, MTFace *tface, const float (*orcodata)[3], float w[4], diff --git a/source/blender/draw/DRW_pbvh.h b/source/blender/draw/DRW_pbvh.h index db21f22aeb0..d49e5b6c686 100644 --- a/source/blender/draw/DRW_pbvh.h +++ b/source/blender/draw/DRW_pbvh.h @@ -64,7 +64,7 @@ typedef struct PBVH_GPU_Args { int *prim_indices; int totprim; - bool *hide_poly; + const bool *hide_poly; int node_verts_num; diff --git a/source/blender/draw/intern/draw_cache_impl_particles.c b/source/blender/draw/intern/draw_cache_impl_particles.c index d2f9a634922..5b45fa38704 100644 --- a/source/blender/draw/intern/draw_cache_impl_particles.c +++ b/source/blender/draw/intern/draw_cache_impl_particles.c @@ -310,8 +310,8 @@ static void particle_calculate_parent_uvs(ParticleSystem *psys, } } if (!ELEM(num, DMCACHE_NOTFOUND, DMCACHE_ISCHILD)) { - MFace *mfaces = CustomData_get_layer(&psmd->mesh_final->fdata, CD_MFACE); - MFace *mface = &mfaces[num]; + const MFace *mfaces = CustomData_get_layer(&psmd->mesh_final->fdata, CD_MFACE); + const MFace *mface = &mfaces[num]; for (int j = 0; j < num_uv_layers; j++) { psys_interpolate_uvs(mtfaces[j] + num, mface->v4, particle->fuv, r_uv[j]); } @@ -340,8 +340,8 @@ static void particle_calculate_parent_mcol(ParticleSystem *psys, } } if (!ELEM(num, DMCACHE_NOTFOUND, DMCACHE_ISCHILD)) { - MFace *mfaces = CustomData_get_layer(&psmd->mesh_final->fdata, CD_MFACE); - MFace *mface = &mfaces[num]; + const MFace *mfaces = CustomData_get_layer(&psmd->mesh_final->fdata, CD_MFACE); + const MFace *mface = &mfaces[num]; for (int j = 0; j < num_col_layers; j++) { /* CustomDataLayer CD_MCOL has 4 structs per face. */ psys_interpolate_mcol(mcols[j] + num * 4, mface->v4, particle->fuv, &r_mcol[j]); @@ -367,8 +367,8 @@ static void particle_interpolate_children_uvs(ParticleSystem *psys, ChildParticle *particle = &psys->child[child_index]; int num = particle->num; if (num != DMCACHE_NOTFOUND) { - MFace *mfaces = CustomData_get_layer(&psmd->mesh_final->fdata, CD_MFACE); - MFace *mface = &mfaces[num]; + const MFace *mfaces = CustomData_get_layer(&psmd->mesh_final->fdata, CD_MFACE); + const MFace *mface = &mfaces[num]; for (int j = 0; j < num_uv_layers; j++) { psys_interpolate_uvs(mtfaces[j] + num, mface->v4, particle->fuv, r_uv[j]); } @@ -392,8 +392,8 @@ static void particle_interpolate_children_mcol(ParticleSystem *psys, ChildParticle *particle = &psys->child[child_index]; int num = particle->num; if (num != DMCACHE_NOTFOUND) { - MFace *mfaces = CustomData_get_layer(&psmd->mesh_final->fdata, CD_MFACE); - MFace *mface = &mfaces[num]; + const MFace *mfaces = CustomData_get_layer(&psmd->mesh_final->fdata, CD_MFACE); + const MFace *mface = &mfaces[num]; for (int j = 0; j < num_col_layers; j++) { /* CustomDataLayer CD_MCOL has 4 structs per face. */ psys_interpolate_mcol(mcols[j] + num * 4, mface->v4, particle->fuv, &r_mcol[j]); diff --git a/source/blender/draw/intern/draw_pbvh.cc b/source/blender/draw/intern/draw_pbvh.cc index 964d2190177..68ef6cef8a6 100644 --- a/source/blender/draw/intern/draw_pbvh.cc +++ b/source/blender/draw/intern/draw_pbvh.cc @@ -595,7 +595,8 @@ struct PBVHBatches { fill_vbo_normal_faces(vbo, args, foreach_faces, &access); break; case CD_PBVH_MASK_TYPE: { - float *mask = static_cast<float *>(CustomData_get_layer(args->vdata, CD_PAINT_MASK)); + const float *mask = static_cast<const float *>( + CustomData_get_layer(args->vdata, CD_PAINT_MASK)); if (mask) { foreach_faces( @@ -613,7 +614,7 @@ struct PBVHBatches { break; } case CD_PBVH_FSET_TYPE: { - int *face_sets = static_cast<int *>( + const int *face_sets = static_cast<const int *>( CustomData_get_layer_named(args->pdata, CD_PROP_INT32, ".sculpt_face_set")); if (face_sets) { @@ -653,13 +654,13 @@ struct PBVHBatches { } case CD_PROP_COLOR: if (vbo.domain == ATTR_DOMAIN_POINT) { - MPropCol *mpropcol = static_cast<MPropCol *>( + const MPropCol *mpropcol = static_cast<const MPropCol *>( CustomData_get_layer_named(args->vdata, CD_PROP_COLOR, vbo.name.c_str())); foreach_faces( [&](int /*buffer_i*/, int /*tri_i*/, int vertex_i, const MLoopTri * /*tri*/) { ushort color[4]; - MPropCol *col = mpropcol + vertex_i; + const MPropCol *col = mpropcol + vertex_i; color[0] = unit_float_to_ushort_clamp(col->color[0]); color[1] = unit_float_to_ushort_clamp(col->color[1]); @@ -670,12 +671,12 @@ struct PBVHBatches { }); } else if (vbo.domain == ATTR_DOMAIN_CORNER) { - MPropCol *mpropcol = static_cast<MPropCol *>( + const MPropCol *mpropcol = static_cast<const MPropCol *>( CustomData_get_layer_named(args->ldata, CD_PROP_COLOR, vbo.name.c_str())); foreach_faces([&](int /*buffer_i*/, int tri_i, int /*vertex_i*/, const MLoopTri *tri) { us @@ Diff output truncated at 10240 characters. @@ _______________________________________________ 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