[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37181] branches/soc-2011-onion: Revision: 29794

[Jason Wilkins]

Revision: 37181
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37181
Author:   jwilkins
Date:     2011-06-04 16:10:06 +0000 (Sat, 04 Jun 2011)
Log Message:
-----------
Revision: 29794
Author: nicholasbishop
Date: 10:38:19 AM, Tuesday, June 29, 2010
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-2011-onion/source/blender/blenkernel/intern/customdata.c

Property Changed:
----------------
    branches/soc-2011-onion/


Property changes on: branches/soc-2011-onion
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-29585,29596,29662-29663,29779,29783
/trunk/blender:36833-37054
   + /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-29585,29596,29662-29663,29779,29783,29794
/trunk/blender:36833-37054

Modified: branches/soc-2011-onion/source/blender/blenkernel/intern/customdata.c
===================================================================
--- branches/soc-2011-onion/source/blender/blenkernel/intern/customdata.c	2011-06-04 16:08:16 UTC (rev 37180)
+++ branches/soc-2011-onion/source/blender/blenkernel/intern/customdata.c	2011-06-04 16:10:06 UTC (rev 37181)
@@ -814,10 +814,12 @@
 	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)
 {
@@ -895,7 +897,8 @@
 	CD_MASK_FACEGRID | CD_MASK_PAINTMASK;
 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_FACEGRID;
+	CD_MASK_MCOL|CD_MASK_PROP_FLT | CD_MASK_PROP_INT | CD_MASK_PROP_STR |
+	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 |