[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39125] branches/soc-2011-onion/source/ blender/blenkernel/intern/customdata.c: Revision: 30842

[Jason Wilkins]

Revision: 39125
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39125
Author:   jwilkins
Date:     2011-08-07 10:29:43 +0000 (Sun, 07 Aug 2011)
Log Message:
-----------
Revision: 30842
Author: nicholasbishop
Date: 9:42:03 AM, Wednesday, July 28, 2010
Message:
== VPaint ==

* Fixed going into edit mode losing multires color data

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

-- 
jwilkins: note on previous commit, multires vpaint does work, I forget that you have to add an mcol layer for it to work.  it is still pretty buggy 

Modified Paths:
--------------
    branches/soc-2011-onion/source/blender/blenkernel/intern/customdata.c

Modified: branches/soc-2011-onion/source/blender/blenkernel/intern/customdata.c
===================================================================
--- branches/soc-2011-onion/source/blender/blenkernel/intern/customdata.c	2011-08-07 10:18:22 UTC (rev 39124)
+++ branches/soc-2011-onion/source/blender/blenkernel/intern/customdata.c	2011-08-07 10:29:43 UTC (rev 39125)
@@ -891,7 +891,7 @@
 	/* CD_CLOTH_ORCO */
 	{sizeof(float)*3, "", 0, NULL, NULL, NULL, NULL, NULL, NULL},
 	/* CD_GRID */
-	{sizeof(CustomData), "CustomDataMultires", 1, "Grid", layerCopy_grid, layerFree_grid, NULL, NULL, NULL},
+	{sizeof(CustomDataMultires), "CustomDataMultires", 1, "Grid", layerCopy_grid, layerFree_grid, NULL, NULL, NULL},
 	/* CD_PAINTMASK */
 	{sizeof(float), "", 0, "Mask", NULL, NULL, NULL, NULL, NULL},
 };
@@ -911,11 +911,11 @@
 	CD_MASK_MVERT | CD_MASK_MEDGE | CD_MASK_MFACE |
 	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_GRIDS | 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_PAINTMASK;
+	CD_MASK_MDISPS | CD_MASK_GRIDS | 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 |
@@ -990,6 +990,9 @@
 			newlayer->active_clone = lastclone;
 			newlayer->active_mask = lastmask;
 			newlayer->flag |= lastflag & (CD_FLAG_EXTERNAL|CD_FLAG_IN_MEMORY);
+
+			if(layer->flag & CD_FLAG_MULTIRES)
+				newlayer->flag |= CD_FLAG_MULTIRES;
 		}
 	}
 }