tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

Cleanup: Retrieve const custom data layers

This commit is contained in:
Hans Goudey 2023-03-29 11:08:57 -04:00
parent 5efa39096c
commit 431d9858c5
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/blenkernel/intern/multires_unsubdivide.cc
View File

@ -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<int *>(CustomData_get_layer_named_for_write(
&base_mesh->vdata, CD_PROP_INT32, vname, base_mesh->totvert));
context->base_to_orig_vmap = static_cast<const int *>(
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<int *>(
MEM_calloc_arrayN(base_mesh->totvert, sizeof(int), "base vmap"));
context->base_to_orig_vmap = static_cast<int *>(CustomData_get_layer_named_for_write(
&base_mesh->vdata, CD_PROP_INT32, vname, base_mesh->totvert));
context->base_to_orig_vmap = static_cast<const int *>(
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];
}

2
source/blender/blenkernel/intern/multires_unsubdivide.h
View File

@ -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;
/* --------------------------------------------------------------------