[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29094] branches/soc-2010-nicolasbishop/ source/blender: * Filled out LAYERTYPEINFO and LAYERNAMETYPES for the new custom data types I added .
Nicholas Bishop
nicholasbishop at gmail.com
Mon May 31 04:51:31 CEST 2010
Revision: 29094
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29094
Author: nicholasbishop
Date: 2010-05-31 04:51:30 +0200 (Mon, 31 May 2010)
Log Message:
-----------
* Filled out LAYERTYPEINFO and LAYERNAMETYPES for the new custom data types I added.
Modified Paths:
--------------
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/customdata.c
branches/soc-2010-nicolasbishop/source/blender/makesdna/DNA_customdata_types.h
Modified: branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/customdata.c
===================================================================
--- branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/customdata.c 2010-05-31 02:39:28 UTC (rev 29093)
+++ branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/customdata.c 2010-05-31 02:51:30 UTC (rev 29094)
@@ -760,6 +760,7 @@
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},
@@ -776,6 +777,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},
@@ -788,13 +791,18 @@
{sizeof(float)*3*4, "", 0, NULL, NULL, NULL, NULL, NULL, NULL},
{sizeof(MDisps), "MDisps", 1, NULL, layerCopy_mdisps,
layerFree_mdisps, layerInterp_mdisps, layerSwap_mdisps, NULL, layerRead_mdisps, layerWrite_mdisps, layerFilesize_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,
+ {sizeof(MCol)*4, "MCol", 4, "IDCol", NULL, NULL, layerInterp_mcol,
layerSwap_mcol, layerDefault_mcol},
- {sizeof(MCol)*4, "MCol", 4, "TexturedCol", NULL, NULL, layerInterp_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, "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},
};
const char *LAYERTYPENAMES[CD_NUMTYPES] = {
@@ -802,7 +810,8 @@
/* 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-24 */ "CDWeightMCol", "CDIDMCol", "CDTextureMCol", "CDClothOrco", "CDFaceGrid",
+ /* 25-26 */ "CDDisp", "CDPaintMask"
};
const CustomDataMask CD_MASK_BAREMESH =
Modified: branches/soc-2010-nicolasbishop/source/blender/makesdna/DNA_customdata_types.h
===================================================================
--- branches/soc-2010-nicolasbishop/source/blender/makesdna/DNA_customdata_types.h 2010-05-31 02:39:28 UTC (rev 29093)
+++ branches/soc-2010-nicolasbishop/source/blender/makesdna/DNA_customdata_types.h 2010-05-31 02:51:30 UTC (rev 29094)
@@ -113,8 +113,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