diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-07-10 08:58:08 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-07-10 08:58:50 +0300 |
| commit | 66f1c3b882d59ea2b6600dfe9464c7c81e8c8483 (patch) | |
| tree | 4a5a3c089e4acdf6f6082408a90f39767c29a778 /source/blender/makesdna/DNA_armature_types.h | |
| parent | 5513fdc62988ec92a0c76824b2a8d56a88c02254 (diff) | |
DNA: replace GCC poison with ifdef for enums
Diffstat (limited to 'source/blender/makesdna/DNA_armature_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_armature_types.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/source/blender/makesdna/DNA_armature_types.h b/source/blender/makesdna/DNA_armature_types.h index 6b7e70f454b..b995e6917a9 100644 --- a/source/blender/makesdna/DNA_armature_types.h +++ b/source/blender/makesdna/DNA_armature_types.h @@ -153,16 +153,15 @@ typedef enum eArmature_DeformFlag { ARM_DEF_VGROUP = (1<<0), ARM_DEF_ENVELOPE = (1<<1), ARM_DEF_QUATERNION = (1<<2), +#ifdef DNA_DEPRECATED ARM_DEF_B_BONE_REST = (1<<3), /* deprecated */ +#endif ARM_DEF_INVERT_VGROUP = (1<<4) } eArmature_DeformFlag; -#if (DNA_DEPRECATED_GCC_POISON == 1) -#pragma GCC poison ARM_DEF_B_BONE_REST -#endif - /* armature->pathflag */ // XXX deprecated... old animation system (armature only viz) +#ifdef DNA_DEPRECATED typedef enum eArmature_PathFlag { ARM_PATH_FNUMS = (1<<0), ARM_PATH_KFRAS = (1<<1), @@ -170,9 +169,6 @@ typedef enum eArmature_PathFlag { ARM_PATH_ACFRA = (1<<3), ARM_PATH_KFNOS = (1<<4) } eArmature_PathFlag; - -#if (DNA_DEPRECATED_GCC_POISON == 1) -#pragma GCC poison ARM_PATH_FNUMS ARM_PATH_KFRAS ARM_PATH_HEADS ARM_PATH_ACFRA ARM_PATH_KFNOS #endif /* armature->ghosttype */ |