diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-07-10 09:47:39 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-07-10 09:47:39 +0300 |
| commit | a8b8d60c50280026d58e06e6ec8cdb73cced97e0 (patch) | |
| tree | 805c3f2cb592c1b6b89382fc3c985bf778b9c257 /source/blender/makesdna/DNA_customdata_types.h | |
| parent | a7ed374459afb77c86201cbef1c09ea622bd44cc (diff) | |
CustomData: deprecate CD_ID_MCOL
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 74f5967db13..a92c8b3307c 100644 --- a/source/blender/makesdna/DNA_customdata_types.h +++ b/source/blender/makesdna/DNA_customdata_types.h @@ -76,7 +76,9 @@ typedef struct CustomData { /* CustomData.type */ typedef enum CustomDataType { CD_MVERT = 0, +#ifdef DNA_DEPRECATED CD_MSTICKY = 1, /* DEPRECATED */ +#endif CD_MDEFORMVERT = 2, CD_MEDGE = 3, CD_MFACE = 4, @@ -96,7 +98,7 @@ typedef enum CustomDataType { CD_TANGENT = 18, CD_MDISPS = 19, CD_PREVIEW_MCOL = 20, /* for displaying weightpaint colors */ - CD_ID_MCOL = 21, +/* CD_ID_MCOL = 21, */ CD_TEXTURE_MCOL = 22, CD_CLOTH_ORCO = 23, CD_RECAST = 24, @@ -127,7 +129,7 @@ typedef enum CustomDataType { /* Bits for CustomDataMask */ #define CD_MASK_MVERT (1 << CD_MVERT) -#define CD_MASK_MSTICKY (1 << CD_MSTICKY) /* DEPRECATED */ +// #define CD_MASK_MSTICKY (1 << CD_MSTICKY) /* DEPRECATED */ #define CD_MASK_MDEFORMVERT (1 << CD_MDEFORMVERT) #define CD_MASK_MEDGE (1 << CD_MEDGE) #define CD_MASK_MFACE (1 << CD_MFACE) |