diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-03-05 14:26:45 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-03-05 14:26:45 +0300 |
commit | 8d8d113b7379b96d8cd9440f4e1f87524a418fef (patch) | |
tree | ecc4ac8f59c846918fd280db82ee87dc15c92e4d /release | |
parent | 0ae6747300a74daf14482f9ca89caffa9e503454 (diff) |
Tool System: use set/add/subtract for all circle select operators
This applies changes from the 3D view circle select to other operators.
Diffstat (limited to 'release')
-rw-r--r-- | release/scripts/presets/keyconfig/keymap_data/blender_default.py | 13 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_toolsystem_toolbar.py | 4 |
2 files changed, 6 insertions, 11 deletions
diff --git a/release/scripts/presets/keyconfig/keymap_data/blender_default.py b/release/scripts/presets/keyconfig/keymap_data/blender_default.py index 38bb539c616..8235a560f4d 100644 --- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py +++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py @@ -5141,12 +5141,7 @@ 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": params.tool_mouse, "value": 'PRESS'}, - {"properties": [("wait_for_input", False), ("deselect", False)]}), - ("uv.select_circle", {"type": params.tool_mouse, "value": 'PRESS', "ctrl": True}, - {"properties": [("wait_for_input", False), ("deselect", True)]}), - ]}, + {"items": _template_items_tool_select_actions_circle("uv.select_circle", type=params.tool_mouse, value='PRESS')}, ) @@ -5885,11 +5880,7 @@ def km_3d_view_tool_edit_gpencil_select_circle(params): return ( "3D View Tool: Edit Gpencil, Select Circle", {"space_type": 'VIEW_3D', "region_type": 'WINDOW'}, - {"items": [ - ("gpencil.select_circle", {"type": params.tool_tweak, "value": 'ANY'}, None), - ("gpencil.select_circle", {"type": params.tool_mouse, "value": 'PRESS', "ctrl": True}, - {"properties": [("deselect", True)]}), - ]}, + {"items": _template_items_tool_select_actions_circle("gpencil.select_circle", type=params.tool_mouse, value='PRESS')}, ) diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py index 370c7185583..7ed1a7a49b7 100644 --- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py +++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py @@ -1073,6 +1073,7 @@ class _defs_image_uv_select: def circle(): def draw_settings(context, layout, tool): props = tool.operator_properties("uv.select_circle") + layout.prop(props, "mode", expand=True) layout.prop(props, "radius") return dict( text="Select Circle", @@ -1223,6 +1224,9 @@ class _defs_gpencil_edit: @ToolDef.from_fn def circle_select(): def draw_settings(context, layout, tool): + props = tool.operator_properties("gpencil.select_circle") + layout.prop(props, "mode", expand=True) + layout.prop(props, "radius") layout.prop(context.tool_settings.gpencil_sculpt, "intersection_threshold") return dict( text="Select Circle", |