diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2010-10-24 17:05:09 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2010-10-24 17:05:09 +0400 |
| commit | 3b2515ba0e71aeefb7ba43d7cede9fb05259b7f6 (patch) | |
| tree | f50dd3c9c81675a8e354097f09b151b2a3cd4e1e /source/blender/makesdna/DNA_modifier_types.h | |
| parent | 86e433728d8e45716537e1a6ac0719383bd10aa0 (diff) | |
| parent | a301d2c898ed353aa6902a4893574ab24b7a2b4e (diff) | |
Merged changes in the trunk up to revision 32684.
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 27f9c9cd5f3..0708698c40c 100644 --- a/source/blender/makesdna/DNA_modifier_types.h +++ b/source/blender/makesdna/DNA_modifier_types.h @@ -220,7 +220,8 @@ typedef struct ArrayModifierData { typedef struct MirrorModifierData { ModifierData modifier; - short axis, flag; + short axis; /* deprecated, use flag instead */ + short flag; float tolerance; struct Object *mirror_ob; } MirrorModifierData; |