diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-12-04 22:39:19 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-12-04 22:39:19 +0400 |
commit | 22a1ad61f93a4b060500e5295c58b128f24a2daf (patch) | |
tree | 5693c7acd41e5d325cf3f6f1675cbceb232dd8a4 /source/blender/makesdna/DNA_modifier_types.h | |
parent | a115c02605b2692710f5d9b64d87407b7ca5b374 (diff) | |
parent | 937c5494c4933c65635450e66aeacffed74939f2 (diff) |
svn merge ^/trunk/blender -r42372:42416
Diffstat (limited to 'source/blender/makesdna/DNA_modifier_types.h')
-rw-r--r-- | source/blender/makesdna/DNA_modifier_types.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h index 77ee74c0420..0ace54fdb3a 100644 --- a/source/blender/makesdna/DNA_modifier_types.h +++ b/source/blender/makesdna/DNA_modifier_types.h @@ -25,6 +25,7 @@ * \ingroup DNA */ +#include "DNA_defs.h" #include "DNA_listBase.h" @@ -241,7 +242,7 @@ typedef struct ArrayModifierData { typedef struct MirrorModifierData { ModifierData modifier; - short axis; /* deprecated, use flag instead */ + short axis DNA_DEPRECATED; /* deprecated, use flag instead */ short flag; float tolerance; struct Object *mirror_ob; |