diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2009-10-23 03:22:05 +0400 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2009-10-23 03:22:05 +0400 |
| commit | 8f788c64db587e74079d812dbcea40c2bd4b91ff (patch) | |
| tree | c767e8318a9e7aded16be6cab2042f3ea11e7912 /source/blender/makesdna/DNA_customdata_types.h | |
| parent | 36bb566d4e6e06e08d782d610d60d755cbda2396 (diff) | |
merge with trunk/2.5 at r23876
[[Split portion of a mixed commit.]]
Diffstat (limited to 'source/blender/makesdna/DNA_customdata_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_customdata_types.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/makesdna/DNA_customdata_types.h b/source/blender/makesdna/DNA_customdata_types.h index 2b8cd90b4d5..e4a16da0365 100644 --- a/source/blender/makesdna/DNA_customdata_types.h +++ b/source/blender/makesdna/DNA_customdata_types.h @@ -76,11 +76,13 @@ typedef struct CustomData { #define CD_MLOOPCOL 17 #define CD_TANGENT 18 #define CD_MDISPS 19 -#define CD_WEIGHT_MCOL 20 /* for displaying weightpaint colors */ +#define CD_WEIGHT_MCOL 20 /* for displaying weightpaint colors */ #define CD_MPOLY 21 #define CD_MLOOP 22 #define CD_WEIGHT_MLOOPCOL 23 -#define CD_NUMTYPES 24 +#define CD_ID_MCOL 24 +#define CD_TEXTURE_MCOL 25 +#define CD_NUMTYPES 26 /* Bits for CustomDataMask */ #define CD_MASK_MVERT (1 << CD_MVERT) |