diff options
Diffstat (limited to 'source/blender/makesdna/DNA_customdata_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_customdata_types.h | 28 |
1 files changed, 23 insertions, 5 deletions
diff --git a/source/blender/makesdna/DNA_customdata_types.h b/source/blender/makesdna/DNA_customdata_types.h index d98e5200d21..b5666a4dc37 100644 --- a/source/blender/makesdna/DNA_customdata_types.h +++ b/source/blender/makesdna/DNA_customdata_types.h @@ -45,7 +45,7 @@ typedef struct CustomDataLayer { int active_rnd; /* number of the layer to render*/ int active_clone; /* number of the layer to render*/ int active_mask; /* number of the layer to render*/ - char pad[4]; + int uid; /*shape keyblock unique id reference*/ char name[32]; /* layer name */ void *data; /* layer data */ } CustomDataLayer; @@ -59,6 +59,7 @@ typedef struct CustomDataExternal { * layers, each with a data type (e.g. MTFace, MDeformVert, etc.). */ typedef struct CustomData { CustomDataLayer *layers; /* CustomDataLayers, ordered by type */ + int typemap[100]; /* maps types to indices of first layer of that type */ int totlayer, maxlayer; /* number of layers, size of layers array */ int totsize, pad; /* in editmode, total size of all data layers */ void *pool; /* Bmesh: Memory pool for allocation of blocks */ @@ -87,11 +88,18 @@ typedef struct CustomData { #define CD_TANGENT 18 #define CD_MDISPS 19 #define CD_WEIGHT_MCOL 20 /* for displaying weightpaint colors */ -#define CD_ID_MCOL 21 -#define CD_TEXTURE_MCOL 22 +#define CD_MPOLY 21 +#define CD_MLOOP 22 #define CD_CLOTH_ORCO 23 -#define CD_RECAST 24 -#define CD_NUMTYPES 25 +#define CD_ID_MCOL 24 +#define CD_TEXTURE_MCOL 25 +#define CD_SHAPE_KEYINDEX 26 +#define CD_SHAPEKEY 27 +#define CD_BWEIGHT 28 +#define CD_CREASE 29 +#define CD_WEIGHT_MLOOPCOL 30 +#define CD_RECAST 31 +#define CD_NUMTYPES 32 /* Bits for CustomDataMask */ #define CD_MASK_MVERT (1 << CD_MVERT) @@ -115,9 +123,19 @@ typedef struct CustomData { #define CD_MASK_TANGENT (1 << CD_TANGENT) #define CD_MASK_MDISPS (1 << CD_MDISPS) #define CD_MASK_WEIGHT_MCOL (1 << CD_WEIGHT_MCOL) +#define CD_MASK_MPOLY (1 << CD_MPOLY) +#define CD_MASK_MLOOP (1 << CD_MLOOP) +#define CD_MASK_WEIGHT_MLOOPCOL (1 << CD_WEIGHT_MLOOPCOL) +#define CD_MASK_SHAPE_KEYINDEX (1 << CD_SHAPE_KEYINDEX) +#define CD_MASK_SHAPEKEY (1 << CD_SHAPEKEY) #define CD_MASK_CLOTH_ORCO (1 << CD_CLOTH_ORCO) #define CD_MASK_RECAST (1 << CD_RECAST) +/* derivedmesh wants CustomDataMask for weightpaint too, is not customdata though */ +#define CD_MASK_WEIGHTPAINT (1 << CD_WEIGHTPAINT) +#define CD_MASK_BWEIGHT (1 << CD_BWEIGHT) +#define CD_MASK_CREASE (1 << CD_CREASE) + /* CustomData.flag */ /* indicates layer should not be copied by CustomData_from_template or |