griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: Use blender::Array instead of raw pointer for PolyCornerIndex

Browse Source 
Changes `MultiresDisplacementData` to use a `blender::Array` instead of
a manually allocated pointer to allow for using `Span`s and avoid
further manual memory management.

Note that `MultiresDisplacementData` is already handled via C++ style
`new` & `delete` and does not need to be converted as a prerequisite.

Pull Request: https://projects.blender.org/blender/blender/pulls/140328
This commit is contained in:
Sean Kim
2025-06-16 00:56:12 +02:00
committed by Sean Kim
parent 23cc842319
commit 716653d22b
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/blenkernel/intern/subdiv_displacement_multires.cc
View File

@@ -44,7 +44,7 @@ struct MultiresDisplacementData {
*
* NOTE: For quad face this is an index of first corner only, since
* there we only have one PTEX. */
PolyCornerIndex *ptex_face_corner = nullptr;
Array<PolyCornerIndex> ptex_face_corner = {};
/* Indexed by coarse face index, returns first PTEX face index corresponding
* to that coarse face. */
int *face_ptex_offset = nullptr;
@@ -360,7 +360,6 @@ static void free_displacement(Displacement *displacement)
{
MultiresDisplacementData *data = static_cast<MultiresDisplacementData *>(
displacement->user_data);
MEM_freeN(data->ptex_face_corner);
MEM_delete(data);
}
@@ -382,12 +381,10 @@ static void displacement_data_init_mapping(Displacement &displacement, const Mes
displacement.user_data);
const OffsetIndices faces = mesh.faces();
const int num_ptex_faces = count_num_ptex_faces(mesh);
/* Allocate memory. */
data.ptex_face_corner = MEM_malloc_arrayN<PolyCornerIndex>(size_t(num_ptex_faces),
"PTEX face corner");
data.ptex_face_corner.reinitialize(num_ptex_faces);
/* Fill in offsets. */
int ptex_face_index = 0;
PolyCornerIndex *ptex_face_corner = data.ptex_face_corner;
MutableSpan<PolyCornerIndex> ptex_face_corner = data.ptex_face_corner.as_mutable_span();
for (int face_index = 0; face_index < mesh.faces_num; face_index++) {
const IndexRange face = faces[face_index];
if (face.size() == 4) {