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

[Jason Wilkins]

Revision: 37120
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37120
Author:   jwilkins
Date:     2011-06-03 12:53:51 +0000 (Fri, 03 Jun 2011)
Log Message:
-----------
Revision: 28987
Author: nicholasbishop
Date: 2:50:15 PM, Tuesday, May 25, 2010
Message:
* Added a few new customdata types:
* FACEGRID will be the new way all CustomData for multires gets stored. Its backing type is CustomData. It's intended to be used in the CustomData for mesh faces. This is similar to CD_MDISPS, except that instead of storing just triples of floats, we can store a grid for any type (so long as there's a CustomData layer for it.)
* CD_DISP will be the replacement for CD_MDISPS. It's a triple of floats.
* PAINTMASK is simply a layer of floats; will be used to describe the intensity of the mask at each vertex (or at each grid point for multires.)

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

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-28986,29263,29350
/trunk/blender:36833-37054
   + /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-28987,29263,29350
/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-03 12:34:48 UTC (rev 37119)
+++ branches/soc-2011-onion/source/blender/blenkernel/intern/customdata.c	2011-06-03 12:53:51 UTC (rev 37120)
@@ -844,7 +844,10 @@
 	 layerSwap_mcol, layerDefault_mcol},
 	 {sizeof(MCol)*4, "MCol", 4, "TexturedCol", NULL, NULL, layerInterp_mcol,
 	 layerSwap_mcol, layerDefault_mcol},
-	{sizeof(float)*3, "", 0, NULL, NULL, NULL, NULL, NULL, NULL}
+	{sizeof(float)*3, "", 0, NULL, NULL, NULL, NULL, NULL, NULL},
+	{sizeof(CustomData), "CustomData", 1, "CustomData Grid", NULL, NULL, NULL, NULL, NULL},
+	{sizeof(float) * 3, "", 0, "Displacement", NULL, NULL, NULL, NULL, NULL},
+	{sizeof(float), "", 0, "Paint Mask", NULL, NULL, NULL, NULL, NULL},
 };
 
 static const char *LAYERTYPENAMES[CD_NUMTYPES] = {
@@ -852,7 +855,7 @@
 	/*   5-9 */ "CDMTFace", "CDMCol", "CDOrigIndex", "CDNormal", "CDFlags",
 	/* 10-14 */ "CDMFloatProperty", "CDMIntProperty","CDMStringProperty", "CDOrigSpace", "CDOrco",
 	/* 15-19 */ "CDMTexPoly", "CDMLoopUV", "CDMloopCol", "CDTangent", "CDMDisps",
-	/* 20-23 */"CDWeightMCol", "CDIDMCol", "CDTextureMCol", "CDClothOrco"
+	/* 20-25 */"CDWeightMCol", "CDIDMCol", "CDTextureMCol", "CDClothOrco", "CDDisp", "CDPaintMask"
 };
 
 const CustomDataMask CD_MASK_BAREMESH =
@@ -860,10 +863,10 @@
 const CustomDataMask CD_MASK_MESH =
 	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_PROP_FLT | CD_MASK_PROP_INT | CD_MASK_PROP_STR | CD_MASK_MDISPS | CD_MASK_FACEGRID;
 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_MCOL|CD_MASK_PROP_FLT | CD_MASK_PROP_INT | CD_MASK_PROP_STR | CD_MASK_MDISPS | CD_MASK_FACEGRID;
 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 |

Modified: branches/soc-2011-onion/source/blender/makesdna/DNA_customdata_types.h
===================================================================
--- branches/soc-2011-onion/source/blender/makesdna/DNA_customdata_types.h	2011-06-03 12:34:48 UTC (rev 37119)
+++ branches/soc-2011-onion/source/blender/makesdna/DNA_customdata_types.h	2011-06-03 12:53:51 UTC (rev 37120)
@@ -92,7 +92,10 @@
 #define CD_ID_MCOL		21
 #define CD_TEXTURE_MCOL	22
 #define CD_CLOTH_ORCO	23
-#define CD_NUMTYPES		24
+#define CD_FACEGRID		24
+#define CD_DISP			25
+#define CD_PAINTMASK	26
+#define CD_NUMTYPES		27
 
 /* Bits for CustomDataMask */
 #define CD_MASK_MVERT		(1 << CD_MVERT)
@@ -117,6 +120,9 @@
 #define CD_MASK_MDISPS		(1 << CD_MDISPS)
 #define CD_MASK_WEIGHT_MCOL	(1 << CD_WEIGHT_MCOL)
 #define CD_MASK_CLOTH_ORCO	(1 << CD_CLOTH_ORCO)
+#define CD_MASK_FACEGRID	(1 << CD_FACEGRID)
+#define CD_MASK_PAINTMASK	(1 << CD_PAINTMASK)
+#define CD_MASK_DISP		(1 << CD_DISP)
 
 /* CustomData.flag */