diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-12-17 01:42:12 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-12-17 01:49:23 +0300 |
| commit | 96ebdbc90ff93f55e202997334ef3ff811f497fb (patch) | |
| tree | f46426f457b80991250e98c1a580fa3b064ff336 /source/blender/makesdna/DNA_customdata_types.h | |
| parent | bcd38b398ce19a1757ab1f7f51ef50df8eef8d41 (diff) | |
Fix deprecated DNA define checks
Also remove dead code which checked for SPACE_TIME.
Diffstat (limited to 'source/blender/makesdna/DNA_customdata_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_customdata_types.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/makesdna/DNA_customdata_types.h b/source/blender/makesdna/DNA_customdata_types.h index 0a6423d569f..f70dc19616b 100644 --- a/source/blender/makesdna/DNA_customdata_types.h +++ b/source/blender/makesdna/DNA_customdata_types.h @@ -97,7 +97,7 @@ typedef enum CustomDataType { CD_AUTO_FROM_NAME = -1, CD_MVERT = 0, -#ifdef DNA_DEPRECATED +#ifdef DNA_DEPRECATED_ALLOW CD_MSTICKY = 1, /* DEPRECATED */ #endif CD_MDEFORMVERT = 2, @@ -113,7 +113,7 @@ typedef enum CustomDataType { CD_PROP_STR = 12, CD_ORIGSPACE = 13, /* for modifier stack face location mapping */ CD_ORCO = 14, /* undeformed vertex coordinates, normalized to 0..1 range */ -#ifdef DNA_DEPRECATED +#ifdef DNA_DEPRECATED_ALLOW CD_MTEXPOLY = 15, /* deprecated */ #endif CD_MLOOPUV = 16, |