diff options
author | William Reynish <billrey@me.com> | 2019-07-04 14:04:40 +0300 |
---|---|---|
committer | William Reynish <billrey@me.com> | 2019-07-04 14:04:40 +0300 |
commit | 944458fe6c6e34732a75b3c8adb11161f523a1d9 (patch) | |
tree | 7b5996caea2b00e6491c0db9f923ab4e0d3c0ba4 /release | |
parent | 711960b3c234d02ac11f11a22fd15436bdd489d5 (diff) |
Industry Compat keymap: Fix keymap conflict related to snapping
There were some keymap conflicts and inconsistencies here. After this change, it works as follows:
Snap toggle on/off: X
Snap pie: Shift-X
Viewpoint pie: V
This is now consistent in all editors and the 3d View conflict should be gone
Diffstat (limited to 'release')
-rw-r--r-- | release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py | 20 |
1 files changed, 16 insertions, 4 deletions
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 9fe84d24cbd..e3aa54830cd 100644 --- a/release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py +++ b/release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py @@ -530,11 +530,13 @@ def km_uv_editor(params): ("uv.hide", {"type": 'H', "value": 'PRESS', "shift": True}, {"properties": [("unselected", True)]}), ("uv.reveal", {"type": 'H', "value": 'PRESS', "alt": True}, None), - op_menu_pie("IMAGE_MT_uvs_snap_pie", {"type": 'S', "value": 'PRESS', "shift": True}), + op_menu_pie("IMAGE_MT_uvs_snap_pie", {"type": 'X', "value": 'PRESS', "shift": True}), op_menu("IMAGE_MT_uvs_select_mode", {"type": 'TAB', "value": 'PRESS', "ctrl": True}), op_menu("IMAGE_MT_uvs_context_menu", {"type": 'RIGHTMOUSE', "value": 'PRESS'}), ("wm.context_toggle", {"type": 'B', "value": 'PRESS'}, {"properties": [("data_path", 'tool_settings.use_proportional_edit')]}), + ("wm.context_toggle", {"type": 'X', "value": 'PRESS'}, + {"properties": [("data_path", 'tool_settings.use_snap')]}), # Tools op_tool("builtin.select_box", {"type": 'Q', "value": 'PRESS'}), op_tool("builtin.move", {"type": 'W', "value": 'PRESS'}), @@ -675,13 +677,14 @@ def km_view3d(params): ("view3d.copybuffer", {"type": 'C', "value": 'PRESS', "ctrl": True}, None), ("view3d.pastebuffer", {"type": 'V', "value": 'PRESS', "ctrl": True}, None), # Menus. - op_menu_pie("VIEW3D_MT_snap_pie", {"type": 'V', "value": 'PRESS'}), + op_menu_pie("VIEW3D_MT_snap_pie", {"type": 'X', "value": 'PRESS', "shift": True}), # Transform. ("transform.translate", {"type": 'EVT_TWEAK_L', "value": 'ANY'}, None), op_menu_pie("VIEW3D_MT_pivot_pie", {"type": 'PERIOD', "value": 'PRESS'}), op_menu_pie("VIEW3D_MT_orientations_pie", {"type": 'COMMA', "value": 'PRESS'}), ("view3d.toggle_xray", {"type": 'X', "value": 'PRESS', "alt": True}, None), - + ("wm.context_toggle", {"type": 'X', "value": 'PRESS'}, + {"properties": [("data_path", 'tool_settings.use_snap')]}), ]) return keymap @@ -878,8 +881,11 @@ def km_graph_editor(params): ("transform.resize", {"type": 'R', "value": 'PRESS'}, None), ("wm.context_toggle", {"type": 'B', "value": 'PRESS'}, {"properties": [("data_path", 'tool_settings.use_proportional_fcurve')]}), + ("wm.context_menu_enum", {"type": 'X', "value": 'PRESS'}, + {"properties": [("data_path", 'space_data.auto_snap')]}), ("marker.add", {"type": 'M', "value": 'PRESS'}, None), ("marker.rename", {"type": 'RET', "value": 'PRESS'}, None), + op_menu_pie("GRAPH_MT_snap_pie", {"type": 'X', "value": 'PRESS', "shift": True}), ]) return keymap @@ -1096,6 +1102,8 @@ def km_node_editor(params): ("transform.resize", {"type": 'R', "value": 'PRESS'}, None), ("node.move_detach_links_release", {"type": params.action_tweak, "value": 'ANY', "alt": True}, None), ("node.move_detach_links", {"type": 'EVT_TWEAK_L', "value": 'ANY', "alt": True}, None), + ("wm.context_toggle", {"type": 'X', "value": 'PRESS'}, + {"properties": [("data_path", 'tool_settings.use_snap')]}), ]) return keymap @@ -1327,6 +1335,9 @@ def km_dopesheet(params): ("action.select_less", {"type": 'DOWN_ARROW', "value": 'PRESS', "ctrl": True}, None), ("action.select_linked", {"type": 'RIGHT_BRACKET', "value": 'PRESS'}, None), ("action.frame_jump", {"type": 'G', "value": 'PRESS', "ctrl": True}, None), + ("wm.context_menu_enum", {"type": 'X', "value": 'PRESS'}, + {"properties": [("data_path", 'space_data.auto_snap')]}), + op_menu_pie("DOPESHEET_MT_snap_pie", {"type": 'X', "value": 'PRESS', "shift": True}), op_menu("DOPESHEET_MT_context_menu", {"type": 'RIGHTMOUSE', "value": 'PRESS'}), op_menu("DOPESHEET_MT_delete", {"type": 'BACK_SPACE', "value": 'PRESS'}), op_menu("DOPESHEET_MT_delete", {"type": 'DEL', "value": 'PRESS'}), @@ -1466,6 +1477,7 @@ def km_nla_editor(params): ("transform.transform", {"type": 'R', "value": 'PRESS'}, {"properties": [("mode", 'TIME_SCALE')]}), op_menu("NLA_MT_context_menu", {"type": 'RIGHTMOUSE', "value": 'PRESS'}), + op_menu_pie("NLA_MT_snap_pie", {"type": 'X', "value": 'PRESS', "shift": True}), ("marker.add", {"type": 'M', "value": 'PRESS'}, None), ("marker.rename", {"type": 'RET', "value": 'PRESS'}, None), ]) @@ -1714,7 +1726,7 @@ def km_sequencer(params): ("sequencer.gap_remove", {"type": 'BACK_SPACE', "value": 'PRESS', "shift": True}, {"properties": [("all", True)]}), ("sequencer.gap_insert", {"type": 'EQUAL', "value": 'PRESS', "shift": True}, None), - ("sequencer.snap", {"type": 'S', "value": 'PRESS', "shift": True}, None), + ("sequencer.snap", {"type": 'X', "value": 'PRESS'}, None), ("sequencer.swap_inputs", {"type": 'S', "value": 'PRESS', "alt": True}, None), *( (("sequencer.cut_multicam", |