[Bf-blender-cvs] [2a811e69554] master: Tool System: add node circle select tool

Campbell Barton noreply at git.blender.org
Tue Mar 5 13:30:26 CET 2019


Commit: 2a811e69554881d85e5311538b4406d5aae6a66d
Author: Campbell Barton
Date:   Tue Mar 5 23:29:49 2019 +1100
Branches: master
https://developer.blender.org/rB2a811e69554881d85e5311538b4406d5aae6a66d

Tool System: add node circle select tool

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

M	release/scripts/presets/keyconfig/keymap_data/blender_default.py
M	release/scripts/startup/bl_ui/space_toolsystem_toolbar.py

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

diff --git a/release/scripts/presets/keyconfig/keymap_data/blender_default.py b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
index 8235a560f4d..79afdeaf296 100644
--- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py
+++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
@@ -5189,6 +5189,12 @@ def km_node_editor_tool_select_lasso(params):
         ]},
     )
 
+def km_node_editor_tool_select_circle(params):
+    return (
+        "Node Tool: Select Circle",
+        {"space_type": 'NODE_EDITOR', "region_type": 'WINDOW'},
+        {"items": _template_items_tool_select_actions_circle("node.select_circle", type=params.tool_mouse, value='PRESS')},
+    )
 
 def km_node_editor_tool_links_cut(params):
     return (
@@ -6110,6 +6116,7 @@ def generate_keymaps(params=None):
         km_node_editor_tool_select(params),
         km_node_editor_tool_select_box(params),
         km_node_editor_tool_select_lasso(params),
+        km_node_editor_tool_select_circle(params),
         km_node_editor_tool_links_cut(params),
         km_3d_view_tool_cursor(params),
         km_3d_view_tool_select(params),
diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
index 7ed1a7a49b7..d1d2cad2c15 100644
--- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
@@ -1331,6 +1331,20 @@ class _defs_node_select:
             draw_settings=draw_settings,
         )
 
+    @ToolDef.from_fn
+    def circle():
+        def draw_settings(context, layout, tool):
+            props = tool.operator_properties("node.select_circle")
+            layout.prop(props, "mode", expand=True)
+            layout.prop(props, "radius")
+        return dict(
+            text="Select Circle",
+            icon="ops.generic.select_circle",
+            widget=None,
+            keymap="Node Tool: Select Circle",
+            draw_settings=draw_settings,
+        )
+
 
 class _defs_node_edit:
 
@@ -1455,6 +1469,7 @@ class NODE_PT_tools_active(ToolSelectPanelHelper, Panel):
             _defs_node_select.select,
             _defs_node_select.box,
             _defs_node_select.lasso,
+            _defs_node_select.circle,
         ),
     )



More information about the Bf-blender-cvs mailing list