archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Multires reshape: correct grids level allocation

Browse Source 
Similar to masking grids, need to also check existing grid level.

This is because edit mode might leave allocated grid with 0 levels.
This commit is contained in:
Sergey Sharybin
2019-01-24 14:23:14 +01:00
parent ac316a6526
commit f15a5440a1
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/blenkernel/intern/multires_reshape.c
View File

@@ -89,6 +89,9 @@ static void multires_reshape_allocate_displacement_grid(
const int grid_area = grid_size * grid_size;
float (*disps)[3] = MEM_calloc_arrayN(
grid_area, 3 * sizeof(float), "multires disps");
if (displacement_grid->disps != NULL) {
MEM_freeN(displacement_grid->disps);
}
displacement_grid->disps = disps;
displacement_grid->totdisp = grid_area;
displacement_grid->level = level;
@@ -97,7 +100,7 @@ static void multires_reshape_allocate_displacement_grid(
static void multires_reshape_ensure_displacement_grid(
MDisps *displacement_grid, const int level)
{
if (displacement_grid->disps != NULL) {
if (displacement_grid->disps != NULL && displacement_grid->level == level) {
return;
}
multires_reshape_allocate_displacement_grid(