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

Merge branch 'blender-v4.4-release'

Browse Source
This commit is contained in:
Bastien Montagne
2025-02-13 19:31:28 +01:00
parent 8fed30aff2 455d419f1e
commit aaef10e99e
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -359,7 +359,7 @@ static void free_displacement(Displacement *displacement)
MultiresDisplacementData *data = static_cast<MultiresDisplacementData *>(
displacement->user_data);
MEM_freeN(data->ptex_face_corner);
MEM_freeN(data);
MEM_delete(data);
}
/* TODO(sergey): This seems to be generally used information, which almost
@@ -439,8 +439,7 @@ void displacement_attach_from_multires(Subdiv *subdiv, Mesh *mesh, const Multire
}
/* Allocate all required memory. */
Displacement *displacement = MEM_cnew<Displacement>("multires displacement");
displacement->user_data = MEM_callocN(sizeof(MultiresDisplacementData),
"multires displacement data");
displacement->user_data = MEM_new<MultiresDisplacementData>("multires displacement data");
displacement_init_data(displacement, subdiv, mesh, mmd);
displacement_init_functions(displacement);
/* Finish. */