diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2010-07-19 08:44:37 +0400 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2010-07-19 08:44:37 +0400 |
| commit | c11c196efadf5ef52293d782638497f86a209722 (patch) | |
| tree | 43abcd60b2400d28db8686f4dbea68f17475ef58 /source/blender/makesdna/DNA_customdata_types.h | |
| parent | f54aa7811029c90b6071ccc9e27e57a758e5884d (diff) | |
| parent | 7f083c45bee15f7540e2a35a725efe28fc962239 (diff) | |
part 1 of merge from trunk at r30358; it compiles, but doesn't link quite yet :)
Diffstat (limited to 'source/blender/makesdna/DNA_customdata_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_customdata_types.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/makesdna/DNA_customdata_types.h b/source/blender/makesdna/DNA_customdata_types.h index 52822b67b68..8d5d34fbe9b 100644 --- a/source/blender/makesdna/DNA_customdata_types.h +++ b/source/blender/makesdna/DNA_customdata_types.h @@ -84,14 +84,15 @@ typedef struct CustomData { #define CD_WEIGHT_MCOL 20 /* for displaying weightpaint colors */ #define CD_MPOLY 21 #define CD_MLOOP 22 -#define CD_WEIGHT_MLOOPCOL 23 +#define CD_CLOTH_ORCO 23 #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_NUMTYPES 30 +#define CD_WEIGHT_MLOOPCOL 30 +#define CD_NUMTYPES 31 /* Bits for CustomDataMask */ #define CD_MASK_MVERT (1 << CD_MVERT) @@ -120,6 +121,8 @@ typedef struct CustomData { #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) + /* derivedmesh wants CustomDataMask for weightpaint too, is not customdata though */ #define CD_MASK_WEIGHTPAINT (1 << CD_WEIGHTPAINT) #define CD_MASK_BWEIGHT (1 << CD_BWEIGHT) |