Commit: 02d77e5bf56cdbbf7defe249a319fca14738725f
Author: Campbell Barton
Date: Thu Nov 15 12:54:44 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB02d77e5bf56cdbbf7defe249a319fca14738725f
Keymap: use parameters for tool keymap
===================================================================
M release/scripts/presets/keyconfig/keymap_data/blender_default.py
===================================================================
diff --git a/release/scripts/presets/keyconfig/keymap_data/blender_default.py
b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
index 6e062e9d317..276e2a99dbc 100644
--- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py
+++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
@@ -4812,677 +4812,677 @@ def km_backdrop_transform_widget(_params):
#
# Named are auto-generated based on the tool name and it's toolbar.
-def km_image_editor_tool_uv_cursor(_params):
+def km_image_editor_tool_uv_cursor(params):
return (
"Image Editor Tool: Uv, Cursor",
{"space_type": 'IMAGE_EDITOR', "region_type": 'WINDOW'},
{"items": (
- ("uv.cursor_set", {"type": 'ACTIONMOUSE', "value": 'PRESS'}, None),
- ("transform.translate", {"type": 'EVT_TWEAK_A', "value": 'ANY'},
+ ("uv.cursor_set", {"type": params.action_mouse, "value": 'PRESS'},
None),
+ ("transform.translate", {"type": params.action_tweak, "value":
'ANY'},
{"properties": [("release_confirm", True), ("cursor_transform",
True)]}),
),
},
)
-def km_image_editor_tool_uv_select_box(_params):
+def km_image_editor_tool_uv_select_box(params):
return (
"Image Editor Tool: Uv, Select Box",
{"space_type": 'IMAGE_EDITOR', "region_type": 'WINDOW'},
{"items": (
- ("uv.select_box", {"type": 'EVT_TWEAK_A', "value": 'ANY'}, None),
- ("uv.select_box", {"type": 'EVT_TWEAK_A', "value": 'ANY', "ctrl":
True},
+ ("uv.select_box", {"type": params.action_tweak, "value": 'ANY'},
None),
+ ("uv.select_box", {"type": params.action_tweak, "value": 'ANY',
"ctrl": True},
{"properties": [("deselect", True)]}),
),
},
)
-def km_image_editor_tool_uv_select_circle(_params):
+def km_image_editor_tool_uv_select_circle(params):
return (
"Image Editor Tool: Uv, Select Circle",
{"space_type": 'IMAGE_EDITOR', "region_type": 'WINDOW'},
{"items": (
- ("uv.select_circle", {"type": 'ACTIONMOUSE', "value": 'PRESS'},
+ ("uv.select_circle", {"type": params.action_mouse, "value":
'PRESS'},
{"properties": [("deselect", False)]}),
- ("uv.select_circle", {"type": 'ACTIONMOUSE', "value": 'PRESS',
"ctrl": True},
+ ("uv.select_circle", {"type": params.action_mouse, "value":
'PRESS', "ctrl": True},
{"properties": [("deselect", True)]}),
),
},
)
-def km_image_editor_tool_uv_select_lasso(_params):
+def km_image_editor_tool_uv_select_lasso(params):
return (
"Image Editor Tool: Uv, Select Lasso",
{"space_type": 'IMAGE_EDITOR', "region_type": 'WINDOW'},
{"items": (
- ("uv.select_lasso", {"type": 'EVT_TWEAK_A', "value": 'ANY'},
+ ("uv.select_lasso", {"type": params.action_tweak, "value": 'ANY'},
{"properties": [("deselect", False)]}),
),
},
)
-def km_image_editor_tool_uv_annotate(_params):
+def km_image_editor_tool_uv_annotate(params):
return (
"Image Editor Tool: Uv, Annotate",
{"space_type": 'IMAGE_EDITOR', "region_type": 'WINDOW'},
{"items": (
- ("gpencil.annotate", {"type": 'ACTIONMOUSE', "value": 'PRESS'},
+ ("gpencil.annotate", {"type": params.action_mouse, "value":
'PRESS'},
{"properties": [("mode", 'DRAW'), ("wait_for_input", False)]}),
),
},
)
-def km_image_editor_tool_uv_annotate_line(_params):
+def km_image_editor_tool_uv_annotate_line(params):
return (
"Image Editor Tool: Uv, Annotate Line",
{"space_type": 'IMAGE_EDITOR', "region_type": 'WINDOW'},
{"items": (
- ("gpencil.annotate", {"type": 'EVT_TWEAK_A', "value": 'ANY'},
+ ("gpencil.annotate", {"type": params.action_tweak, "value": 'ANY'},
{"properties": [("mode", 'DRAW_STRAIGHT'), ("wait_for_input",
False)]}),
),
},
)
-def km_image_editor_tool_uv_annotate_polygon(_params):
+def km_image_editor_tool_uv_annotate_polygon(params):
return (
"Image Editor Tool: Uv, Annotate Polygon",
{"space_type": 'IMAGE_EDITOR', "region_type": 'WINDOW'},
{"items": (
- ("gpencil.annotate", {"type": 'ACTIONMOUSE', "value": 'PRESS'},
+ ("gpencil.annotate", {"type": params.action_mouse, "value":
'PRESS'},
{"properties": [("mode", 'DRAW_POLY'), ("wait_for_input",
False)]}),
),
},
)
-def km_image_editor_tool_uv_annotate_eraser(_params):
+def km_image_editor_tool_uv_annotate_eraser(params):
return (
"Image Editor Tool: Uv, Annotate Eraser",
{"space_type": 'IMAGE_EDITOR', "region_type": 'WINDOW'},
{"items": (
- ("gpencil.annotate", {"type": 'ACTIONMOUSE', "value": 'PRESS'},
+ ("gpencil.annotate", {"type": params.action_mouse, "value":
'PRESS'},
{"properties": [("mode", 'ERASER'), ("wait_for_input", False)]}),
),
},
)
-def km_3d_view_tool_object_cursor(_params):
+def km_3d_view_tool_object_cursor(params):
return (
"3D View Tool: Object, Cursor",
{"space_type": 'VIEW_3D', "region_type": 'WINDOW'},
{"items": (
- ("view3d.cursor3d", {"type": 'ACTIONMOUSE', "value": 'PRESS'},
None),
- ("transform.translate", {"type": 'EVT_TWEAK_A', "value": 'ANY'},
+ ("view3d.cursor3d", {"type": params.action_mouse, "value":
'PRESS'}, None),
+ ("transform.translate", {"type": params.action_tweak, "value":
'ANY'},
{"properties": [("release_confirm", True), ("cursor_transform",
True)]}),
),
},
)
-def km_3d_view_tool_object_select_box(_params):
+def km_3d_view_tool_object_select_box(params):
return (
"3D View Tool: Object, Select Box",
{"space_type": 'VIEW_3D', "region_type": 'WINDOW'},
- {"items": _template_items_tool_select_actions("view3d.select_box",
type='EVT_TWEAK_A', value='ANY')},
+ {"items": _template_items_tool_select_actions("view3d.select_box",
type=params.action_tweak, value='ANY')},
)
-def km_3d_view_tool_object_select_circle(_params):
+def km_3d_view_tool_object_select_circle(params):
return (
"3D View Tool: Object, Select Circle",
{"space_type": 'VIEW_3D', "region_type": 'WINDOW'},
{"items": (
- ("view3d.select_circle", {"type": 'ACTIONMOUSE', "value": 'PRESS'},
+ ("view3d.select_circle", {"type": params.action_mouse, "value":
'PRESS'},
{"properties": [("deselect", False)]}),
- ("view3d.select_circle", {"type": 'ACTIONMOUSE', "value": 'PRESS',
"ctrl": True},
+ ("view3d.select_circle", {"type": params.action_mouse, "value":
'PRESS', "ctrl": True},
{"properties": [("deselect", True)]}),
),
},
)
-def km_3d_view_tool_object_select_lasso(_params):
+def km_3d_view_tool_object_select_lasso(params):
return (
"3D View Tool: Object, Select Lasso",
{"space_type": 'VIEW_3D', "region_type": 'WINDOW'},
- {"items": _template_items_tool_select_actions("view3d.select_lasso",
type='EVT_TWEAK_A', value='ANY')},
+ {"items": _template_items_tool_select_actions("view3d.select_lasso",
type=params.action_tweak, value='ANY')},
)
-def km_3d_view_tool_object_transform(_params):
+def km_3d_view_tool_object_transform(params):
return (
"3D View Tool: Object, Transform",
{"space_type": 'VIEW_3D', "region_type": 'WINDOW'},
{"items": (
- ("transform.from_gizmo", {"type": 'EVT_TWEAK_A', "value": 'ANY'},
None),
+ ("transform.from_gizmo", {"type": params.action_tweak, "value":
'ANY'}, None),
),
},
)
-def km_3d_view_tool_object_move(_params):
+def km_3d_view_tool_object_move(params):
return (
"3D View Tool: Object, Move",
{"space_type": 'VIEW_3D', "region_type": 'WINDOW'},
{"items": (
- ("transform.translate", {"type": 'EVT_TWEAK_A', "value": 'ANY'},
+ ("transform.translate", {"type": params.action_tweak, "value":
'ANY'},
{"properties": [("release_confirm", True)]}),
),
},
)
-def km_3d_view_tool_object_rotate(_params):
+def km_3d_view_tool_object_rotate(params):
return (
"3D View Tool: Object, Rotate",
{"space_type": 'VIEW_3D', "region_type": 'WINDOW'},
{"items": (
- ("transform.rotate", {"type": 'EVT_TWEAK_A', "value": 'ANY'},
+ ("transform.rotate", {"type": params.action_tweak, "value": 'ANY'},
{"properties": [("release_confirm", True)]}),
),
},
)
-def km_3d_view_tool_object_scale(_params):
+def km_3d_view_tool_object_scale(params):
return (
"3D View Tool: Object, Scale",
{"space_type": 'VIEW_3D', "region_type": 'WINDOW'},
{"items": (
- ("transform.resize", {"type": 'EVT_TWEAK_A', "value": 'ANY'},
+ ("transform.resize", {"type": params.action_tweak, "value": 'ANY'},
{"properties": [("release_confirm", True)]}),
),
},
)
-def km_3d_view_tool_object_annotate(_params):
+def km_3d_view_tool_object_annotate(params):
return (
"3D View Tool: Object, Annotate",
{"space_type": 'VIEW_3D', "region_type": 'WINDOW'},
{"items": (
- ("gpencil.annotate", {"type": 'ACTIONMOUSE', "value": 'PRESS'},
+ ("gpencil.annotate", {"type": params.action_mouse, "value":
'PRESS'},
{"properties": [("mode", 'DRAW'), ("wait_for_input", False)]}),
),
},
)
-def km_3d_view_tool_object_annotate_line(_params):
+def km_3d_view_tool_object_annotate_line(params):
return (
"3D View Tool: Object, Annotate Line",
{"space_type": 'VIEW_3D', "region_type": 'WINDOW'},
{"items": (
- ("gpencil.annotate", {"type": 'EVT_TWEAK_A', "
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
