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

Jason Wilkins Jason.A.Wilkins at gmail.com
Fri Jun 3 15:09:44 CEST 2011


Revision: 37121
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37121
Author:   jwilkins
Date:     2011-06-03 13:09:44 +0000 (Fri, 03 Jun 2011)
Log Message:
-----------
Revision: 29094
Author: nicholasbishop
Date: 9:51:30 PM, Sunday, May 30, 2010
Message:
* Filled out LAYERTYPEINFO and LAYERNAMETYPES for the new custom data types I added.

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-28987,29263,29350
/trunk/blender:36833-37054
   + /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-29094,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:53:51 UTC (rev 37120)
+++ branches/soc-2011-onion/source/blender/blenkernel/intern/customdata.c	2011-06-03 13:09:44 UTC (rev 37121)
@@ -809,6 +809,7 @@
 
 
 static const LayerTypeInfo LAYERTYPEINFO[CD_NUMTYPES] = {
+	/* 0 */
 	{sizeof(MVert), "MVert", 1, NULL, NULL, NULL, NULL, NULL, NULL},
 	{sizeof(MSticky), "MSticky", 1, NULL, NULL, NULL, layerInterp_msticky, NULL,
 	 NULL},
@@ -825,6 +826,8 @@
 	/* 3 floats per normal vector */
 	{sizeof(float)*3, "", 0, NULL, NULL, NULL, NULL, NULL, NULL},
 	{sizeof(int), "", 0, NULL, NULL, NULL, NULL, NULL, NULL},
+
+	/* 10 */
 	{sizeof(MFloatProperty), "MFloatProperty",1,"Float",NULL,NULL,NULL,NULL},
 	{sizeof(MIntProperty), "MIntProperty",1,"Int",NULL,NULL,NULL,NULL},
 	{sizeof(MStringProperty), "MStringProperty",1,"String",NULL,NULL,NULL,NULL},
@@ -838,6 +841,8 @@
 	{sizeof(MDisps), "MDisps", 1, NULL, layerCopy_mdisps,
 	 layerFree_mdisps, layerInterp_mdisps, layerSwap_mdisps, NULL, layerRead_mdisps, layerWrite_mdisps,
 	 layerFilesize_mdisps, layerValidate_mdisps},
+
+	/* 20 */
 	{sizeof(MCol)*4, "MCol", 4, "WeightCol", NULL, NULL, layerInterp_mcol,
 	 layerSwap_mcol, layerDefault_mcol},
 	 {sizeof(MCol)*4, "MCol", 4, "IDCol", NULL, NULL, layerInterp_mcol,
@@ -845,9 +850,9 @@
 	 {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(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},
+	{sizeof(CustomData), "CustomData", 1, "Face Grid", NULL, NULL, NULL, NULL, NULL},
+	{sizeof(float)*3, "", 0, NULL, NULL, NULL, NULL, NULL, NULL},
+	{sizeof(float), "", 0, NULL, NULL, NULL, NULL, NULL, NULL},
 };
 
 static const char *LAYERTYPENAMES[CD_NUMTYPES] = {
@@ -855,7 +860,8 @@
 	/*   5-9 */ "CDMTFace", "CDMCol", "CDOrigIndex", "CDNormal", "CDFlags",
 	/* 10-14 */ "CDMFloatProperty", "CDMIntProperty","CDMStringProperty", "CDOrigSpace", "CDOrco",
 	/* 15-19 */ "CDMTexPoly", "CDMLoopUV", "CDMloopCol", "CDTangent", "CDMDisps",
-	/* 20-25 */"CDWeightMCol", "CDIDMCol", "CDTextureMCol", "CDClothOrco", "CDDisp", "CDPaintMask"
+	/* 20-24 */ "CDWeightMCol", "CDIDMCol", "CDTextureMCol", "CDClothOrco", "CDFaceGrid",
+	/* 25-26 */ "CDDisp", "CDPaintMask"
 };
 
 const CustomDataMask CD_MASK_BAREMESH =

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:53:51 UTC (rev 37120)
+++ branches/soc-2011-onion/source/blender/makesdna/DNA_customdata_types.h	2011-06-03 13:09:44 UTC (rev 37121)
@@ -121,8 +121,8 @@
 #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_DISP		(1 << CD_DISP)
 #define CD_MASK_PAINTMASK	(1 << CD_PAINTMASK)
-#define CD_MASK_DISP		(1 << CD_DISP)
 
 /* CustomData.flag */
 




More information about the Bf-blender-cvs mailing list