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_modifier_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_modifier_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_modifier_types.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h index 4da5f050dc7..0cc80a0112d 100644 --- a/source/blender/makesdna/DNA_modifier_types.h +++ b/source/blender/makesdna/DNA_modifier_types.h @@ -62,7 +62,7 @@ typedef enum ModifierType { eModifierType_SimpleDeform = 28, eModifierType_Multires = 29, eModifierType_Surface = 30, -#ifdef DNA_DEPRECATED +#ifdef DNA_DEPRECATED_ALLOW eModifierType_Smoke = 31, #endif eModifierType_ShapeKey = 32, @@ -1157,7 +1157,7 @@ enum { MOD_SOLIDIFY_EVEN = (1 << 1), MOD_SOLIDIFY_NORMAL_CALC = (1 << 2), MOD_SOLIDIFY_VGROUP_INV = (1 << 3), -#ifdef DNA_DEPRECATED +#ifdef DNA_DEPRECATED_ALLOW MOD_SOLIDIFY_RIM_MATERIAL = (1 << 4), /* deprecated, used in do_versions */ #endif MOD_SOLIDIFY_FLIP = (1 << 5), @@ -1604,7 +1604,7 @@ typedef struct TriangulateModifierData { /* TriangulateModifierData.flag */ enum { -#ifdef DNA_DEPRECATED +#ifdef DNA_DEPRECATED_ALLOW MOD_TRIANGULATE_BEAUTY = (1 << 0), /* deprecated */ #endif MOD_TRIANGULATE_KEEP_CUSTOMLOOP_NORMALS = 1 << 1, |