[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29794] branches/soc-2010-nicolasbishop/ source/blender/blenkernel/intern/customdata.c: Fixed paint masks + multires going into and out of editmode; wasn' t setting the right number of grid elements when copying face grids.

[Nicholas Bishop]

Revision: 29794
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29794
Author:   nicholasbishop
Date:     2010-06-29 17:38:19 +0200 (Tue, 29 Jun 2010)

Log Message:
-----------
Fixed paint masks + multires going into and out of editmode; wasn't setting the right number of grid elements when copying face grids.

Modified Paths:
--------------
    branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/customdata.c

Modified: branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/customdata.c
===================================================================
--- branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/customdata.c	2010-06-29 13:49:35 UTC (rev 29793)
+++ branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/customdata.c	2010-06-29 15:38:19 UTC (rev 29794)
@@ -765,9 +765,11 @@
 	CustomData *dest = dest_v;
 	int i;
 
-	for(i = 0; i < count; ++i)
+	for(i = 0; i < count; ++i) {
 		CustomData_copy(source + i, dest + i, ~0, CD_DUPLICATE,
 				source[i].grid_elems);
+		dest[i].grid_elems = source[i].grid_elems;
+	}
 }
 
 void layerFree_grid(void *data, int count, int size)
@@ -845,7 +847,7 @@
 const CustomDataMask CD_MASK_EDITMESH =
 	CD_MASK_MSTICKY | CD_MASK_MDEFORMVERT | CD_MASK_MTFACE |
 	CD_MASK_MCOL|CD_MASK_PROP_FLT | CD_MASK_PROP_INT | CD_MASK_PROP_STR |
-	CD_MASK_MDISPS | CD_MASK_PAINTMASK;
+	CD_MASK_MDISPS | CD_MASK_FACEGRID | CD_MASK_PAINTMASK;
 const CustomDataMask CD_MASK_DERIVEDMESH =
 	CD_MASK_MSTICKY | CD_MASK_MDEFORMVERT | CD_MASK_MTFACE |
 	CD_MASK_MCOL | CD_MASK_ORIGINDEX | CD_MASK_PROP_FLT | CD_MASK_PROP_INT | CD_MASK_CLOTH_ORCO |