[Bf-blender-cvs] [d4156b46d7a] master: Tool System: use categories for tool identifiers
Campbell Barton
noreply at git.blender.org
Fri Mar 15 07:07:14 CET 2019
Commit: d4156b46d7a4acb22f3abfde14b05c46ead34b43
Author: Campbell Barton
Date: Fri Mar 15 14:18:21 2019 +1100
Branches: master
https://developer.blender.org/rBd4156b46d7a4acb22f3abfde14b05c46ead34b43
Tool System: use categories for tool identifiers
Tools that come with Blender use 'builtin' or 'builtin_brush' prefix.
===================================================================
M release/scripts/modules/bl_keymap_utils/keymap_from_toolbar.py
M release/scripts/presets/keyconfig/keymap_data/blender_default.py
M release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
M release/scripts/startup/bl_ui/space_topbar.py
M release/scripts/startup/bl_ui/space_view3d.py
M source/blender/blenkernel/BKE_blender_version.h
M source/blender/blenloader/intern/versioning_280.c
M source/blender/editors/transform/transform_gizmo_3d.c
M source/blender/windowmanager/intern/wm_toolsystem.c
===================================================================
diff --git a/release/scripts/modules/bl_keymap_utils/keymap_from_toolbar.py b/release/scripts/modules/bl_keymap_utils/keymap_from_toolbar.py
index 0c812780a23..e08e8b45135 100644
--- a/release/scripts/modules/bl_keymap_utils/keymap_from_toolbar.py
+++ b/release/scripts/modules/bl_keymap_utils/keymap_from_toolbar.py
@@ -68,7 +68,7 @@ def generate(context, space_type):
# a shortcut based workflow (before the tool system was added).
use_tap_reset = True
# TODO: support other tools for modes which don't use this tool.
- tap_reset_tool = "Cursor"
+ tap_reset_tool = "builtin.cursor"
# Check the tool is available in the current context.
if tap_reset_tool not in items_all_id:
use_tap_reset = False
@@ -317,7 +317,7 @@ def generate(context, space_type):
# -------------------------------------------------------------------------
# Assign A-Z to Keys
#
- # When th keys are free.
+ # When the keys are free.
if use_auto_keymap_alpha:
# Map all unmapped keys to numbers,
diff --git a/release/scripts/presets/keyconfig/keymap_data/blender_default.py b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
index 91651b7f549..c1f7785de4e 100644
--- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py
+++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
@@ -5029,9 +5029,9 @@ def km_popup_toolbar(_params):
"Toolbar Popup",
{"space_type": 'EMPTY', "region_type": 'TEMPORARY'},
{"items": [
- op_tool("Select", {"type": 'W', "value": 'PRESS'}),
- op_tool("Transform", {"type": 'T', "value": 'PRESS'}),
- op_tool("Measure", {"type": 'M', "value": 'PRESS'}),
+ op_tool("builtin.select", {"type": 'W', "value": 'PRESS'}),
+ op_tool("builtin.transform", {"type": 'T', "value": 'PRESS'}),
+ op_tool("builtin.measure", {"type": 'M', "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 b0b8327af9a..092494d783f 100644
--- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
@@ -39,6 +39,7 @@ def kmi_to_string_or_none(kmi):
def generate_from_enum_ex(
context, *,
+ idname_prefix,
icon_prefix,
type,
attr,
@@ -51,7 +52,7 @@ def generate_from_enum_ex(
tool_defs.append(
ToolDef.from_dict(
dict(
- idname=name,
+ idname=idname_prefix + name,
label=name,
icon=icon_prefix + idname.lower(),
data_block=idname,
@@ -86,7 +87,7 @@ class _defs_view3d_generic:
layout.prop(props, "use_depth")
layout.prop(props, "orientation")
return dict(
- idname="Cursor",
+ idname="builtin.cursor",
label="Cursor",
description=(
"Set the cursor location, drag to transform"
@@ -99,7 +100,7 @@ class _defs_view3d_generic:
@ToolDef.from_fn
def cursor_click():
return dict(
- idname="None",
+ idname="builtin.none",
label="None",
icon="ops.generic.cursor",
keymap=(),
@@ -126,7 +127,7 @@ class _defs_view3d_generic:
kmi_to_string_or_none(kmi_remove),
)
return dict(
- idname="Measure",
+ idname="builtin.measure",
label="Measure",
description=description,
icon="ops.view3d.ruler",
@@ -179,7 +180,7 @@ class _defs_annotate:
@ToolDef.from_fn.with_args(draw_settings=draw_settings_common)
def scribble(*, draw_settings):
return dict(
- idname="Annotate",
+ idname="builtin.annotate",
label="Annotate",
icon="ops.gpencil.draw",
cursor='PAINT_BRUSH',
@@ -190,7 +191,7 @@ class _defs_annotate:
@ToolDef.from_fn.with_args(draw_settings=draw_settings_common)
def line(*, draw_settings):
return dict(
- idname="Annotate Line",
+ idname="builtin.annotate_line",
label="Annotate Line",
icon="ops.gpencil.draw.line",
cursor='CROSSHAIR',
@@ -201,7 +202,7 @@ class _defs_annotate:
@ToolDef.from_fn.with_args(draw_settings=draw_settings_common)
def poly(*, draw_settings):
return dict(
- idname="Annotate Polygon",
+ idname="builtin.annotate_polygon",
label="Annotate Polygon",
icon="ops.gpencil.draw.poly",
cursor='CROSSHAIR',
@@ -216,7 +217,7 @@ class _defs_annotate:
prefs = context.preferences
layout.prop(prefs.edit, "grease_pencil_eraser_radius", text="Radius")
return dict(
- idname="Annotate Eraser",
+ idname="builtin.annotate_eraser",
label="Annotate Eraser",
icon="ops.gpencil.draw.eraser",
cursor='CROSSHAIR', # XXX: Always show brush circle when enabled
@@ -232,7 +233,7 @@ class _defs_transform:
def draw_settings(context, layout, tool):
_template_widget.TRANSFORM_GGT_gizmo.draw_settings_with_index(context, layout, 1)
return dict(
- idname="Move",
+ idname="builtin.move",
label="Move",
# cursor='SCROLL_XY',
icon="ops.transform.translate",
@@ -247,7 +248,7 @@ class _defs_transform:
def draw_settings(context, layout, tool):
_template_widget.TRANSFORM_GGT_gizmo.draw_settings_with_index(context, layout, 2)
return dict(
- idname="Rotate",
+ idname="builtin.rotate",
label="Rotate",
# cursor='SCROLL_XY',
icon="ops.transform.rotate",
@@ -262,7 +263,7 @@ class _defs_transform:
def draw_settings(context, layout, tool):
_template_widget.TRANSFORM_GGT_gizmo.draw_settings_with_index(context, layout, 3)
return dict(
- idname="Scale",
+ idname="builtin.scale",
label="Scale",
# cursor='SCROLL_XY',
icon="ops.transform.resize",
@@ -277,7 +278,7 @@ class _defs_transform:
def draw_settings(context, layout, tool):
_template_widget.TRANSFORM_GGT_gizmo.draw_settings_with_index(context, layout, 3)
return dict(
- idname="Scale Cage",
+ idname="builtin.scale_cage",
label="Scale Cage",
icon="ops.transform.resize.cage",
widget="VIEW3D_GGT_xform_cage",
@@ -299,7 +300,7 @@ class _defs_transform:
_template_widget.TRANSFORM_GGT_gizmo.draw_settings_with_index(context, layout, 1)
return dict(
- idname="Transform",
+ idname="builtin.transform",
label="Transform",
description=(
"Supports any combination of grab, rotate & scale at once"
@@ -318,7 +319,7 @@ class _defs_view3d_select:
def draw_settings(context, layout, tool):
pass
return dict(
- idname="Select",
+ idname="builtin.select",
label="Select",
icon="ops.generic.select",
widget=None,
@@ -332,7 +333,7 @@ class _defs_view3d_select:
props = tool.operator_properties("view3d.select_box")
layout.prop(props, "mode", expand=True)
return dict(
- idname="Select Box",
+ idname="builtin.select_box",
label="Select Box",
icon="ops.generic.select_box",
widget=None,
@@ -346,7 +347,7 @@ class _defs_view3d_select:
props = tool.operator_properties("view3d.select_lasso")
layout.prop(props, "mode", expand=True)
return dict(
- idname="Select Lasso",
+ idname="builtin.select_lasso",
label="Select Lasso",
icon="ops.generic.select_lasso",
widget=None,
@@ -368,7 +369,7 @@ class _defs_view3d_select:
draw_circle_2d(xy, (1.0,) * 4, radius, 32)
return dict(
- idname="Select Circle",
+ idname="builtin.select_circle",
label="Select Circle",
icon="ops.generic.select_circle",
widget=None,
@@ -387,7 +388,7 @@ class _defs_edit_armature:
@ToolDef.from_fn
def roll():
return dict(
- idname="Roll",
+ idname="builtin.roll",
label="Roll",
icon="ops.armature.bone.roll",
widget=None,
@@ -397,7 +398,7 @@ class _defs_edit_armature:
@ToolDef.from_fn
def bone_envelope():
return dict(
- idname="Bone Envelope",
+ idname="builtin.bone_envelope",
label="Bone Envelope",
icon="ops.transform.bone_envelope",
widget=None,
@@ -407,7 +408,7 @@ class _defs_edit_armature:
@ToolDef.from_fn
def bone_size():
return dict(
- idname="Bone Size",
+ idname="builtin.bone_size",
label="Bone Size",
icon="ops.transform.bone_size",
widget=None,
@@ -417,7 +418,7 @@ class _defs_edit_armature:
@ToolDef.from_fn
def extrude():
return dict(
- idname="Extrude",
+ idname="builtin.extrude",
label="Extrude",
icon="ops.armature.extrude_move",
widget="VIEW3D_GGT_xform_extrude",
@@ -428,7 +429,7 @@ class _defs_edit_armature:
@ToolDef.from_fn
def extrude_cursor():
return dict(
- idname="Extrude to Cursor",
+ idname="builtin.extrude_to_cursor",
label="Extrude to Cursor",
icon="ops.armature.extrude_cursor",
widget=None,
@@ -441,7 +442,7 @@ class _defs_edit_mesh:
@ToolDef.from_fn
def cube_add():
return dict(
- idname="Add Cube",
+ idname="builtin.add_cube",
label="Add Cube",
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list