[Bf-blender-cvs] [819be3639cf] master: Industry Compat keymap: Support the recently added Drag option

William Reynish noreply at git.blender.org
Sat Jan 4 14:33:14 CET 2020


Commit: 819be3639cf3221a328932a0a49dd7a038b081dc
Author: William Reynish
Date:   Sat Jan 4 14:33:11 2020 +0100
Branches: master
https://developer.blender.org/rB819be3639cf3221a328932a0a49dd7a038b081dc

Industry Compat keymap: Support the recently added Drag option

This also simplifies the keymap a lot, since I can now remove a lot of hacky exceptions to make box select work with the gizmo-tools.

===================================================================

M	release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py

===================================================================

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 13523759b95..2ce7c3fc41e 100644
--- a/release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py
+++ b/release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py
@@ -3639,128 +3639,6 @@ def km_generic_gizmo_maybe_drag(params):
     return keymap
 
 
-# ------------------------------------------------------------------------------
-# Tool System Keymaps
-
-
-def km_3d_view_tool_transform(params):
-    return (
-        "3D View Tool: Transform",
-        {"space_type": 'VIEW_3D', "region_type": 'WINDOW'},
-        {"items": [
-            ("transform.from_gizmo", {"type": 'MIDDLEMOUSE', "value": 'ANY'}, None),
-            *_template_items_tool_select_actions("view3d.select_box", type=params.tool_tweak, value='ANY'),
-        ]},
-    )
-
-
-def km_3d_view_tool_move(params):
-    return (
-        "3D View Tool: Move",
-        {"space_type": 'VIEW_3D', "region_type": 'WINDOW'},
-        {"items": [
-            ("transform.translate", {"type": 'MIDDLEMOUSE', "value": 'ANY'},
-             {"properties": [("release_confirm", True)]}),
-            *_template_items_tool_select_actions("view3d.select_box", type=params.tool_tweak, value='ANY'),
-        ]},
-    )
-
-
-def km_3d_view_tool_rotate(params):
-    return (
-        "3D View Tool: Rotate",
-        {"space_type": 'VIEW_3D', "region_type": 'WINDOW'},
-        {"items": [
-            ("transform.rotate", {"type": 'MIDDLEMOUSE', "value": 'ANY'},
-             {"properties": [("release_confirm", True)]}),
-            *_template_items_tool_select_actions("view3d.select_box", type=params.tool_tweak, value='ANY'),
-        ]},
-    )
-
-
-def km_3d_view_tool_scale(params):
-    return (
-        "3D View Tool: Scale",
-        {"space_type": 'VIEW_3D', "region_type": 'WINDOW'},
-        {"items": [
-            ("transform.resize", {"type": 'MIDDLEMOUSE', "value": 'ANY'},
-             {"properties": [("release_confirm", True)]}),
-            *_template_items_tool_select_actions("view3d.select_box", type=params.tool_tweak, value='ANY'),
-        ]},
-    )
-
-
-def km_3d_view_tool_edit_mesh_extrude_region(params):
-    return (
-        "3D View Tool: Edit Mesh, Extrude Region",
-        {"space_type": 'VIEW_3D', "region_type": 'WINDOW'},
-        {"items": [
-            ("mesh.extrude_context_move", {"type": 'MIDDLEMOUSE', "value": 'ANY'},
-             {"properties": [("TRANSFORM_OT_translate", [("release_confirm", True)])]}),
-            *_template_items_tool_select_actions("view3d.select_box", type=params.tool_tweak, value='ANY'),
-        ]},
-    )
-
-
-def km_3d_view_tool_edit_mesh_shear(params):
-    return (
-        "3D View Tool: Edit Mesh, Shear",
-        {"space_type": 'VIEW_3D', "region_type": 'WINDOW'},
-        {"items": [
-            ("transform.shear", {"type": 'MIDDLEMOUSE', "value": 'ANY'},
-             {"properties": [("release_confirm", True)]}),
-            *_template_items_tool_select_actions("view3d.select_box", type=params.tool_tweak, value='ANY'),
-        ]},
-    )
-
-
-def km_3d_view_tool_edit_mesh_spin(params):
-    return (
-        "3D View Tool: Edit Mesh, Spin",
-        {"space_type": 'VIEW_3D', "region_type": 'WINDOW'},
-        {"items": [
-            ("mesh.spin", {"type": 'MIDDLEMOUSE', "value": 'ANY'}, None),
-            *_template_items_tool_select_actions("view3d.select_box", type=params.tool_tweak, value='ANY'),
-        ]},
-    )
-
-
-def km_3d_view_tool_edit_mesh_spin_duplicate(params):
-    return (
-        "3D View Tool: Edit Mesh, Spin Duplicates",
-        {"space_type": 'VIEW_3D', "region_type": 'WINDOW'},
-        {"items": [
-            ("mesh.spin", {"type": 'MIDDLEMOUSE', "value": 'ANY'},
-             {"properties": [("dupli", True)]}),
-            *_template_items_tool_select_actions("view3d.select_box", type=params.tool_tweak, value='ANY'),
-        ]},
-    )
-
-
-def km_3d_view_tool_edit_curve_extrude(params):
-    return (
-        "3D View Tool: Edit Curve, Extrude",
-        {"space_type": 'VIEW_3D', "region_type": 'WINDOW'},
-        {"items": [
-            ("curve.extrude_move", {"type": 'MIDDLEMOUSE', "value": 'ANY'},
-             {"properties": [("TRANSFORM_OT_translate", [("release_confirm", True)])]}),
-            *_template_items_tool_select_actions("view3d.select_box", type=params.tool_tweak, value='ANY'),
-        ]},
-    )
-
-
-def km_3d_view_tool_edit_armature_extrude(params):
-    return (
-        "3D View Tool: Edit Armature, Extrude",
-        {"space_type": 'VIEW_3D', "region_type": 'WINDOW'},
-        {"items": [
-            ("armature.extrude_move", {"type": 'MIDDLEMOUSE', "value": 'ANY'},
-             {"properties": [("TRANSFORM_OT_translate", [("release_confirm", True)])]}),
-            *_template_items_tool_select_actions("view3d.select_box", type=params.tool_tweak, value='ANY'),
-        ]},
-    )
-
-
 # ------------------------------------------------------------------------------
 # Full Configuration
 
@@ -3855,15 +3733,4 @@ def generate_keymaps(params=None):
         km_generic_gizmo_maybe_drag(params),
         km_generic_gizmo_click_drag(params),
 
-        # Tool System.
-        km_3d_view_tool_transform(params),
-        km_3d_view_tool_move(params),
-        km_3d_view_tool_rotate(params),
-        km_3d_view_tool_scale(params),
-        km_3d_view_tool_edit_mesh_extrude_region(params),
-        km_3d_view_tool_edit_mesh_shear(params),
-        km_3d_view_tool_edit_mesh_spin(params),
-        km_3d_view_tool_edit_mesh_spin_duplicate(params),
-        km_3d_view_tool_edit_curve_extrude(params),
-        km_3d_view_tool_edit_armature_extrude(params),
     ]



More information about the Bf-blender-cvs mailing list