From 431d9858c564df172f3562cc4118cb9c994207a0 Mon Sep 17 00:00:00 2001 From: Hans Goudey Date: Wed, 29 Mar 2023 11:08:57 -0400 Subject: [PATCH] Cleanup: Retrieve const custom data layers --- source/blender/blenkernel/intern/multires_unsubdivide.cc | 8 ++++---- source/blender/blenkernel/intern/multires_unsubdivide.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/source/blender/blenkernel/intern/multires_unsubdivide.cc b/source/blender/blenkernel/intern/multires_unsubdivide.cc index be6b1251942..22aee6c06c5 100644 --- a/source/blender/blenkernel/intern/multires_unsubdivide.cc +++ b/source/blender/blenkernel/intern/multires_unsubdivide.cc @@ -938,8 +938,8 @@ static void multires_unsubdivide_prepare_original_bmesh_for_extract( bm_original_mesh, BM_VERT | BM_EDGE | BM_FACE, BM_ELEM_SELECT, false); /* Get the mapping data-layer. */ - context->base_to_orig_vmap = static_cast(CustomData_get_layer_named_for_write( - &base_mesh->vdata, CD_PROP_INT32, vname, base_mesh->totvert)); + context->base_to_orig_vmap = static_cast( + CustomData_get_layer_named(&base_mesh->vdata, CD_PROP_INT32, vname)); /* Tag the base mesh vertices in the original mesh. */ for (int i = 0; i < base_mesh->totvert; i++) { @@ -1008,8 +1008,8 @@ static void multires_unsubdivide_extract_grids(MultiresUnsubdivideContext *conte int *base_to_orig_vmap = static_cast( MEM_calloc_arrayN(base_mesh->totvert, sizeof(int), "base vmap")); - context->base_to_orig_vmap = static_cast(CustomData_get_layer_named_for_write( - &base_mesh->vdata, CD_PROP_INT32, vname, base_mesh->totvert)); + context->base_to_orig_vmap = static_cast( + CustomData_get_layer_named(&base_mesh->vdata, CD_PROP_INT32, vname)); for (int i = 0; i < base_mesh->totvert; i++) { base_to_orig_vmap[i] = context->base_to_orig_vmap[i]; } diff --git a/source/blender/blenkernel/intern/multires_unsubdivide.h b/source/blender/blenkernel/intern/multires_unsubdivide.h index 09df7720694..488c4d16d48 100644 --- a/source/blender/blenkernel/intern/multires_unsubdivide.h +++ b/source/blender/blenkernel/intern/multires_unsubdivide.h @@ -53,7 +53,7 @@ typedef struct MultiresUnsubdivideContext { /* Private data. */ struct BMesh *bm_original_mesh; int *loop_to_face_map; - int *base_to_orig_vmap; + const int *base_to_orig_vmap; } MultiresUnsubdivideContext; /* --------------------------------------------------------------------