diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-01-09 14:52:13 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-01-09 14:52:13 +0300 |
| commit | 83e84b2c2c7c105074b7638af6f783603971e595 (patch) | |
| tree | 423ae97ff8178dc156e331eb018b3d82c6e2f83c /source/blender/makesdna/DNA_modifier_types.h | |
| parent | 375d27f230e41e4bcb53183082739c580f74c709 (diff) | |
| parent | ce0fcf1378b6bdd01ff8fbcbccc31b00aa263e25 (diff) | |
Merge branch 'master' into blender2.8
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 5dbfbaadf75..5df7e49c2f3 100644 --- a/source/blender/makesdna/DNA_modifier_types.h +++ b/source/blender/makesdna/DNA_modifier_types.h @@ -868,8 +868,8 @@ typedef struct SimpleDeformModifierData { char mode; /* deform function */ char axis; /* lock axis (for taper and strech) */ + char deform_axis; /* axis to perform the deform on (default is X, but can be overridden by origin */ char flag; - char pad; } SimpleDeformModifierData; @@ -889,6 +889,7 @@ enum { enum { MOD_SIMPLEDEFORM_LOCK_AXIS_X = (1 << 0), MOD_SIMPLEDEFORM_LOCK_AXIS_Y = (1 << 1), + MOD_SIMPLEDEFORM_LOCK_AXIS_Z = (1 << 2), }; typedef struct ShapeKeyModifierData { |