diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-05-28 08:18:25 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-05-28 08:18:25 +0300 |
commit | 1e51839f1d11cdaf63e3cfa4a6005cc2f92319e5 (patch) | |
tree | 7fddacf6564f4b4782e9abf6f7cea5fd950fd619 /release/scripts/presets/keyconfig | |
parent | 13f292d10d3bb19aa9aa694cecbde499f93e7a54 (diff) |
Cleanup: remove unused modal gizmo keymap
An operator can only have one modal keymap,
there is no use in defining multiple.
Diffstat (limited to 'release/scripts/presets/keyconfig')
-rw-r--r-- | release/scripts/presets/keyconfig/keymap_data/blender_default.py | 47 | ||||
-rw-r--r-- | release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py | 47 |
2 files changed, 34 insertions, 60 deletions
diff --git a/release/scripts/presets/keyconfig/keymap_data/blender_default.py b/release/scripts/presets/keyconfig/keymap_data/blender_default.py index fc6a3573275..c72a2bb6a96 100644 --- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py +++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py @@ -215,23 +215,6 @@ def _template_items_gizmo_tweak_value_click_drag(): ] -def _template_items_gizmo_tweak_modal(): - return [ - ("CANCEL", {"type": 'ESC', "value": 'PRESS', "any": True}, None), - ("CANCEL", {"type": 'RIGHTMOUSE', "value": 'PRESS', "any": True}, None), - ("CONFIRM", {"type": 'RET', "value": 'PRESS', "any": True}, None), - ("CONFIRM", {"type": 'NUMPAD_ENTER', "value": 'PRESS', "any": True}, None), - ("PRECISION_ON", {"type": 'RIGHT_SHIFT', "value": 'PRESS', "any": True}, None), - ("PRECISION_OFF", {"type": 'RIGHT_SHIFT', "value": 'RELEASE', "any": True}, None), - ("PRECISION_ON", {"type": 'LEFT_SHIFT', "value": 'PRESS', "any": True}, None), - ("PRECISION_OFF", {"type": 'LEFT_SHIFT', "value": 'RELEASE', "any": True}, None), - ("SNAP_ON", {"type": 'RIGHT_CTRL', "value": 'PRESS', "any": True}, None), - ("SNAP_OFF", {"type": 'RIGHT_CTRL', "value": 'RELEASE', "any": True}, None), - ("SNAP_ON", {"type": 'LEFT_CTRL', "value": 'PRESS', "any": True}, None), - ("SNAP_OFF", {"type": 'LEFT_CTRL', "value": 'RELEASE', "any": True}, None), - ] - - def _template_items_editmode_mesh_select_mode(params): if params.legacy: return [ @@ -4740,14 +4723,6 @@ def km_generic_gizmos_click_drag(_params): return keymap -def km_generic_gizmos_tweak_modal_map(_params): - keymap = ( - "Generic Gizmos Tweak Modal Map", - {"space_type": 'EMPTY', "region_type": 'WINDOW', "modal": True}, - {"items": _template_items_gizmo_tweak_modal()}, - ) - return keymap - def km_generic_gizmos_select(_params): keymap = ( @@ -4760,11 +4735,24 @@ def km_generic_gizmos_select(_params): return keymap -def km_generic_gizmos_select_tweak_modal_map(_params): +def km_generic_gizmos_tweak_modal_map(_params): keymap = ( - "Generic Gizmos Select Tweak Modal Map", + "Generic Gizmo Tweak Modal Map", {"space_type": 'EMPTY', "region_type": 'WINDOW', "modal": True}, - {"items": _template_items_gizmo_tweak_modal()}, + {"items": [ + ("CANCEL", {"type": 'ESC', "value": 'PRESS', "any": True}, None), + ("CANCEL", {"type": 'RIGHTMOUSE', "value": 'PRESS', "any": True}, None), + ("CONFIRM", {"type": 'RET', "value": 'PRESS', "any": True}, None), + ("CONFIRM", {"type": 'NUMPAD_ENTER', "value": 'PRESS', "any": True}, None), + ("PRECISION_ON", {"type": 'RIGHT_SHIFT', "value": 'PRESS', "any": True}, None), + ("PRECISION_OFF", {"type": 'RIGHT_SHIFT', "value": 'RELEASE', "any": True}, None), + ("PRECISION_ON", {"type": 'LEFT_SHIFT', "value": 'PRESS', "any": True}, None), + ("PRECISION_OFF", {"type": 'LEFT_SHIFT', "value": 'RELEASE', "any": True}, None), + ("SNAP_ON", {"type": 'RIGHT_CTRL', "value": 'PRESS', "any": True}, None), + ("SNAP_OFF", {"type": 'RIGHT_CTRL', "value": 'RELEASE', "any": True}, None), + ("SNAP_ON", {"type": 'LEFT_CTRL', "value": 'PRESS', "any": True}, None), + ("SNAP_OFF", {"type": 'LEFT_CTRL', "value": 'RELEASE', "any": True}, None), + ]}, ) return keymap @@ -5855,9 +5843,8 @@ def generate_keymaps(params=None): # Gizmos. km_generic_gizmos(params), km_generic_gizmos_click_drag(params), - km_generic_gizmos_tweak_modal_map(params), km_generic_gizmos_select(params), - km_generic_gizmos_select_tweak_modal_map(params), + km_generic_gizmos_tweak_modal_map(params), # Pop-Up Keymaps. km_popup_toolbar(params), diff --git a/release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py b/release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py index 39b46fc1bc6..c139ec26d37 100644 --- a/release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py +++ b/release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py @@ -110,22 +110,6 @@ def _template_items_animation(): ] -def _template_items_gizmo_tweak_modal(): - return [ - ("CANCEL", {"type": 'ESC', "value": 'PRESS', "any": True}, None), - ("CANCEL", {"type": 'RIGHTMOUSE', "value": 'PRESS', "any": True}, None), - ("CONFIRM", {"type": 'RET', "value": 'PRESS', "any": True}, None), - ("CONFIRM", {"type": 'NUMPAD_ENTER', "value": 'PRESS', "any": True}, None), - ("PRECISION_ON", {"type": 'RIGHT_SHIFT', "value": 'PRESS', "any": True}, None), - ("PRECISION_OFF", {"type": 'RIGHT_SHIFT', "value": 'RELEASE', "any": True}, None), - ("PRECISION_ON", {"type": 'LEFT_SHIFT', "value": 'PRESS', "any": True}, None), - ("PRECISION_OFF", {"type": 'LEFT_SHIFT', "value": 'RELEASE', "any": True}, None), - ("SNAP_ON", {"type": 'RIGHT_CTRL', "value": 'PRESS', "any": True}, None), - ("SNAP_OFF", {"type": 'RIGHT_CTRL', "value": 'RELEASE', "any": True}, None), - ("SNAP_ON", {"type": 'LEFT_CTRL', "value": 'PRESS', "any": True}, None), - ("SNAP_OFF", {"type": 'LEFT_CTRL', "value": 'RELEASE', "any": True}, None), - ] - # Tool System Templates def _template_items_basic_tools(*, connected=False): @@ -3545,15 +3529,6 @@ def km_generic_gizmos(_params): return keymap -def km_generic_gizmos_tweak_modal_map(_params): - keymap = ( - "Generic Gizmos Tweak Modal Map", - {"space_type": 'EMPTY', "region_type": 'WINDOW', "modal": True}, - {"items": _template_items_gizmo_tweak_modal()}, - ) - return keymap - - def km_generic_gizmos_select(_params): keymap = ( "Generic Gizmos Select", @@ -3565,11 +3540,24 @@ def km_generic_gizmos_select(_params): return keymap -def km_generic_gizmos_select_tweak_modal_map(_params): +def km_generic_gizmos_tweak_modal_map(_params): keymap = ( - "Generic Gizmos Select Tweak Modal Map", + "Generic Gizmo Tweak Modal Map", {"space_type": 'EMPTY', "region_type": 'WINDOW', "modal": True}, - {"items": _template_items_gizmo_tweak_modal()}, + {"items": [ + ("CANCEL", {"type": 'ESC', "value": 'PRESS', "any": True}, None), + ("CANCEL", {"type": 'RIGHTMOUSE', "value": 'PRESS', "any": True}, None), + ("CONFIRM", {"type": 'RET', "value": 'PRESS', "any": True}, None), + ("CONFIRM", {"type": 'NUMPAD_ENTER', "value": 'PRESS', "any": True}, None), + ("PRECISION_ON", {"type": 'RIGHT_SHIFT', "value": 'PRESS', "any": True}, None), + ("PRECISION_OFF", {"type": 'RIGHT_SHIFT', "value": 'RELEASE', "any": True}, None), + ("PRECISION_ON", {"type": 'LEFT_SHIFT', "value": 'PRESS', "any": True}, None), + ("PRECISION_OFF", {"type": 'LEFT_SHIFT', "value": 'RELEASE', "any": True}, None), + ("SNAP_ON", {"type": 'RIGHT_CTRL', "value": 'PRESS', "any": True}, None), + ("SNAP_OFF", {"type": 'RIGHT_CTRL', "value": 'RELEASE', "any": True}, None), + ("SNAP_ON", {"type": 'LEFT_CTRL', "value": 'PRESS', "any": True}, None), + ("SNAP_OFF", {"type": 'LEFT_CTRL', "value": 'RELEASE', "any": True}, None), + ]}, ) return keymap @@ -3786,9 +3774,8 @@ def generate_keymaps(params=None): # Gizmos. km_generic_gizmos(params), - km_generic_gizmos_tweak_modal_map(params), km_generic_gizmos_select(params), - km_generic_gizmos_select_tweak_modal_map(params), + km_generic_gizmos_tweak_modal_map(params), # Tool System. km_3d_view_tool_transform(params), |