[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46652] trunk/blender/source/blender/ blenkernel/intern/multires.c: Fix bug #31460, crash in multires on leaving edit mode

Nicholas Bishop nicholasbishop at gmail.com
Tue May 15 09:37:43 CEST 2012


Revision: 46652
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46652
Author:   nicholasbishop
Date:     2012-05-15 07:37:42 +0000 (Tue, 15 May 2012)
Log Message:
-----------
Fix bug #31460, crash in multires on leaving edit mode

Fix overly aggressive check for creating GridPaintMasks, wasn't
creating them in the right place after adding new faces in editmode.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/multires.c

Modified: trunk/blender/source/blender/blenkernel/intern/multires.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/multires.c	2012-05-15 04:50:57 UTC (rev 46651)
+++ trunk/blender/source/blender/blenkernel/intern/multires.c	2012-05-15 07:37:42 UTC (rev 46652)
@@ -1056,12 +1056,10 @@
 			dispgrid = mdisp->disps;
 
 			/* if needed, reallocate multires paint mask */
-			if (gpm && op == CALC_DISPLACEMENTS) {
-				if (gpm->level < key.level) {
-					gpm->level = key.level;
-					MEM_freeN(gpm->data);
-					gpm->data = MEM_callocN(sizeof(float) * key.grid_area, "gpm.data");
-				}
+			if (gpm && gpm->level < key.level) {
+				gpm->level = key.level;
+				MEM_freeN(gpm->data);
+				gpm->data = MEM_callocN(sizeof(float) * key.grid_area, "gpm.data");
 			}
 
 			for (y = 0; y < gridSize; y++) {




More information about the Bf-blender-cvs mailing list