bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Cleanup: Use generic mesh corner to poly map utility

Browse Source
This commit is contained in:
Hans Goudey 2023-04-04 17:01:19 -04:00
parent e785d956c4
commit f594e951e0
3 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/CMakeLists.txt
View File

@ -506,7 +506,7 @@ set(SRC
intern/lib_intern.h
intern/multires_inline.h
intern/multires_reshape.hh
intern/multires_unsubdivide.h
intern/multires_unsubdivide.hh
intern/ocean_intern.h
intern/pbvh_intern.hh
intern/pbvh_pixels_copy.hh

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

@ -21,6 +21,7 @@
#include "BKE_customdata.h"
#include "BKE_lib_id.h"
#include "BKE_mesh.hh"
#include "BKE_mesh_mapping.h"
#include "BKE_mesh_runtime.h"
#include "BKE_modifier.h"
#include "BKE_multires.h"
@ -32,7 +33,7 @@
#include "DEG_depsgraph_query.h"
#include "multires_reshape.hh"
#include "multires_unsubdivide.h"
#include "multires_unsubdivide.hh"
/* This is done in the following steps:
*
@ -948,15 +949,7 @@ static void multires_unsubdivide_prepare_original_bmesh_for_extract(
BM_elem_flag_set(v, BM_ELEM_TAG, true);
}
/* Create a map from loop index to poly index for the original mesh. */
context->loop_to_face_map = static_cast<int *>(
MEM_calloc_arrayN(original_mesh->totloop, sizeof(int), "loop map"));
for (int i = 0; i < original_mesh->totpoly; i++) {
for (const int corner : original_polys[i]) {
context->loop_to_face_map[corner] = i;
}
}
context->loop_to_face_map = blender::bke::mesh_topology::build_loop_to_poly_map(original_polys);
}
/**
@ -1106,7 +1099,6 @@ static void multires_unsubdivide_private_extract_data_free(MultiresUnsubdivideCo
if (context->bm_original_mesh != nullptr) {
BM_mesh_free(context->bm_original_mesh);
}
MEM_SAFE_FREE(context->loop_to_face_map);
}
void multires_unsubdivide_context_init(MultiresUnsubdivideContext *context,
@ -1222,8 +1214,8 @@ int multiresModifier_rebuild_subdiv(Depsgraph *depsgraph,
multires_force_sculpt_rebuild(object);
MultiresUnsubdivideContext unsubdiv_context = {0};
MultiresReshapeContext reshape_context = {0};
MultiresUnsubdivideContext unsubdiv_context{};
MultiresReshapeContext reshape_context{};
multires_unsubdivide_context_init(&unsubdiv_context, mesh, mmd);

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

@ -52,7 +52,7 @@ typedef struct MultiresUnsubdivideContext {
/* Private data. */
struct BMesh *bm_original_mesh;
int *loop_to_face_map;
blender::Array<int> loop_to_face_map;
const int *base_to_orig_vmap;
} MultiresUnsubdivideContext;