[Bf-blender-cvs] [f15a5440a1e] master: Multires reshape: correct grids level allocation

[Sergey Sharybin]

Commit: f15a5440a1e10d0a3cc8f6bcb0693f9d3c98807c
Author: Sergey Sharybin
Date:   Thu Jan 24 14:23:14 2019 +0100
Branches: master
https://developer.blender.org/rBf15a5440a1e10d0a3cc8f6bcb0693f9d3c98807c

Multires reshape: correct grids level allocation

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

This is because edit mode might leave allocated grid with 0 levels.

===================================================================

M	source/blender/blenkernel/intern/multires_reshape.c

===================================================================

diff --git a/source/blender/blenkernel/intern/multires_reshape.c b/source/blender/blenkernel/intern/multires_reshape.c
index 0c4edf4de9d..0c1b85d8044 100644
--- a/source/blender/blenkernel/intern/multires_reshape.c
+++ b/source/blender/blenkernel/intern/multires_reshape.c
@@ -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(