[Bf-blender-cvs] [1b870bce85d] blender2.8: Tool System: remove custom tool registration

Campbell Barton noreply at git.blender.org
Wed Nov 28 00:41:28 CET 2018


Commit: 1b870bce85db3d2940f0b40b6117b3009c56c220
Author: Campbell Barton
Date:   Wed Nov 28 10:40:02 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB1b870bce85db3d2940f0b40b6117b3009c56c220

Tool System: remove custom tool registration

API is not ready for beta (likely to change).

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

M	release/scripts/modules/bpy/utils/__init__.py
D	release/scripts/templates_py/ui_tool_simple.py

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

diff --git a/release/scripts/modules/bpy/utils/__init__.py b/release/scripts/modules/bpy/utils/__init__.py
index 9889b16829b..75044d9d85c 100644
--- a/release/scripts/modules/bpy/utils/__init__.py
+++ b/release/scripts/modules/bpy/utils/__init__.py
@@ -717,48 +717,6 @@ def register_submodule_factory(module_name, submodule_names):
     return register, unregister
 
 
-# -----------------------------------------------------------------------------
-# Tool Registraion
-
-def register_tool(space_type, context_mode, tool_def):
-    from bl_ui.space_toolsystem_common import ToolSelectPanelHelper
-    cls = ToolSelectPanelHelper._tool_class_from_space_type(space_type)
-    if cls is None:
-        raise Exception(f"Space type {space_type!r} has no toolbar")
-    tools = cls._tools[context_mode]
-
-    keymap_data = tool_def.keymap
-    if keymap_data is not None:
-        if context_mode is None:
-            context_descr = "All"
-        else:
-            context_descr = context_mode.replace("_", " ").title()
-        from bpy import context
-        wm = context.window_manager
-        kc = wm.keyconfigs.default
-        if callable(keymap_data[0]):
-            cls._km_action_simple(kc, context_descr, tool_def.text, keymap_data)
-
-    tools.append(tool_def)
-
-
-def unregister_tool(space_type, context_mode, tool_def):
-    from bl_ui.space_toolsystem_common import ToolSelectPanelHelper
-    cls = ToolSelectPanelHelper._tool_class_from_space_type(space_type)
-    if cls is None:
-        raise Exception(f"Space type {space_type!r} has no toolbar")
-    tools = cls._tools[context_mode]
-    tools.remove(tool_def)
-
-    keymap_data = tool_def.keymap
-    if keymap_data is not None:
-        from bpy import context
-        wm = context.window_manager
-        kc = wm.keyconfigs.default
-        km = keymap_data[0]
-        kc.keymaps.remove(km)
-
-
 # -----------------------------------------------------------------------------
 # Manual lookups, each function has to return a basepath and a sequence
 # of...
diff --git a/release/scripts/templates_py/ui_tool_simple.py b/release/scripts/templates_py/ui_tool_simple.py
deleted file mode 100644
index d9aeb294c68..00000000000
--- a/release/scripts/templates_py/ui_tool_simple.py
+++ /dev/null
@@ -1,35 +0,0 @@
-# This example adds an object mode tool to the toolbar.
-# This is just the circle-select tool.
-import bpy
-from bpy.utils.toolsystem import ToolDef
-
- at ToolDef.from_fn
-def my_tool():
-    def draw_settings(context, layout, tool):
-        props = tool.operator_properties("view3d.select_circle")
-        layout.prop(props, "radius")
-    return dict(
-        text="My Circle Select",
-        description=(
-            "This is a tooltip\n"
-            "with multiple lines"
-        ),
-        icon="ops.generic.select_circle",
-        widget=None,
-        keymap=(
-            ("view3d.select_circle", dict(deselect=False), dict(type='LEFTMOUSE', value='PRESS')),
-            ("view3d.select_circle", dict(deselect=True), dict(type='LEFTMOUSE', value='PRESS', ctrl=True)),
-        ),
-        draw_settings=draw_settings,
-    )
-
-
-def register():
-    bpy.utils.register_tool('VIEW_3D', 'OBJECT', my_tool)
-
-
-def unregister():
-    bpy.utils.unregister_tool('VIEW_3D', 'OBJECT', my_tool)
-
-if __name__ == "__main__":
-    register()



More information about the Bf-blender-cvs mailing list