From 0cb730146b09b4a38abcc04e9d4660d6c2f43945 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 4 Sep 2019 15:30:14 +1000 Subject: Transform: remove X/Y shear tool option Instead use vertical cursor motion for Y axis shear. This removes the shear_axis option completely since we now have two axis options used by shear it's not needed. --- .../presets/keyconfig/keymap_data/blender_default.py | 13 +++++++++++-- release/scripts/startup/bl_ui/space_toolsystem_toolbar.py | 2 -- 2 files changed, 11 insertions(+), 4 deletions(-) (limited to 'release') diff --git a/release/scripts/presets/keyconfig/keymap_data/blender_default.py b/release/scripts/presets/keyconfig/keymap_data/blender_default.py index 7cbea843ae8..88609c7cc52 100644 --- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py +++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py @@ -5567,8 +5567,17 @@ def km_3d_view_tool_edit_mesh_shear(params): "3D View Tool: Edit Mesh, Shear", {"space_type": 'VIEW_3D', "region_type": 'WINDOW'}, {"items": [ - ("transform.shear", {"type": params.tool_tweak, "value": 'ANY'}, - {"properties": [("release_confirm", True)]}), + ("transform.shear", + {"type": params.tool_tweak, "value": 'NORTH'}, + {"properties": [("release_confirm", True), ("orient_axis_ortho", 'Y')]}), + ("transform.shear", + {"type": params.tool_tweak, "value": 'SOUTH'}, + {"properties": [("release_confirm", True), ("orient_axis_ortho", 'Y')]}), + + # Use as fallback to catch diagonals too. + ("transform.shear", + {"type": params.tool_tweak, "value": 'ANY'}, + {"properties": [("release_confirm", True), ("orient_axis_ortho", 'X')]}), ]}, ) diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py index 0af9b51597d..2dd5198f090 100644 --- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py +++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py @@ -724,8 +724,6 @@ class _defs_edit_mesh: def shear(): def draw_settings(context, layout, tool): props = tool.operator_properties("transform.shear") - layout.label(text="View Axis:") - layout.prop(props, "shear_axis", expand=True) _template_widget.VIEW3D_GGT_xform_gizmo.draw_settings_with_index(context, layout, 2) return dict( idname="builtin.shear", -- cgit v1.2.3