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 /release/scripts | |
| parent | 375d27f230e41e4bcb53183082739c580f74c709 (diff) | |
| parent | ce0fcf1378b6bdd01ff8fbcbccc31b00aa263e25 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'release/scripts')
| -rw-r--r-- | release/scripts/startup/bl_ui/properties_data_modifier.py | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/release/scripts/startup/bl_ui/properties_data_modifier.py b/release/scripts/startup/bl_ui/properties_data_modifier.py index e93d509338b..e4296f98f65 100644 --- a/release/scripts/startup/bl_ui/properties_data_modifier.py +++ b/release/scripts/startup/bl_ui/properties_data_modifier.py @@ -848,10 +848,18 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel): col.label(text="Axis, Origin:") col.prop(md, "origin", text="") + col.prop(md, "deform_axis") + if md.deform_method in {'TAPER', 'STRETCH', 'TWIST'}: - col.label(text="Lock:") - col.prop(md, "lock_x") - col.prop(md, "lock_y") + row = col.row(align=True) + row.label(text="Lock:") + deform_axis = md.deform_axis + if deform_axis != 'X': + row.prop(md, "lock_x") + if deform_axis != 'Y': + row.prop(md, "lock_y") + if deform_axis != 'Z': + row.prop(md, "lock_z") col = split.column() col.label(text="Deform:") |