From db5ffdd1a4964aacf586249a8ee98fd1c58e7344 Mon Sep 17 00:00:00 2001 From: Hans Goudey Date: Sat, 4 Jun 2022 17:12:17 +0200 Subject: Cleanup: Use const for retrieved custom data layers --- source/blender/draw/intern/draw_cache_impl_subdivision.cc | 4 ++-- .../blender/draw/intern/mesh_extractors/extract_mesh_vbo_pos_nor.cc | 2 +- source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/source/blender/draw/intern/draw_cache_impl_subdivision.cc b/source/blender/draw/intern/draw_cache_impl_subdivision.cc index c11a5e32c67..b5cdbd3617e 100644 --- a/source/blender/draw/intern/draw_cache_impl_subdivision.cc +++ b/source/blender/draw/intern/draw_cache_impl_subdivision.cc @@ -867,10 +867,10 @@ static bool draw_subdiv_topology_info_cb(const SubdivForeachContext *foreach_con ctx->subdiv_loop_subdiv_edge_index = cache->subdiv_loop_subdiv_edge_index; ctx->subdiv_loop_poly_index = cache->subdiv_loop_poly_index; - ctx->v_origindex = static_cast( + ctx->v_origindex = static_cast( CustomData_get_layer(&ctx->coarse_mesh->vdata, CD_ORIGINDEX)); - ctx->e_origindex = static_cast( + ctx->e_origindex = static_cast( CustomData_get_layer(&ctx->coarse_mesh->edata, CD_ORIGINDEX)); if (cache->num_subdiv_verts) { diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_pos_nor.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_pos_nor.cc index f80b33e28f2..5c0116f08d7 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_pos_nor.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_pos_nor.cc @@ -234,7 +234,7 @@ static void extract_pos_nor_init_subdiv(const DRWSubdivCache *subdiv_cache, if (subdiv_cache->use_custom_loop_normals) { Mesh *coarse_mesh = subdiv_cache->mesh; - const float(*lnors)[3] = static_cast( + const float(*lnors)[3] = static_cast( CustomData_get_layer(&coarse_mesh->ldata, CD_NORMAL)); BLI_assert(lnors != nullptr); diff --git a/source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc b/source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc index 3eea20fdb60..092ba24db64 100644 --- a/source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc +++ b/source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc @@ -453,7 +453,7 @@ int16_t OBJMesh::get_poly_deform_group_index(const int poly_index, BLI_assert(poly_index < export_mesh_eval_->totpoly); BLI_assert(group_weights.size() == BKE_object_defgroup_count(&export_object_eval_)); - const MDeformVert *dvert_layer = static_cast( + const MDeformVert *dvert_layer = static_cast( CustomData_get_layer(&export_mesh_eval_->vdata, CD_MDEFORMVERT)); if (!dvert_layer) { return NOT_FOUND; -- cgit v1.2.3