[Bf-blender-cvs] [642fe9e0f2a] blender2.8: PyAPI: use keywords for ToolDef.from_fn.with_args
Campbell Barton
noreply at git.blender.org
Mon Nov 5 01:59:47 CET 2018
Commit: 642fe9e0f2a9585084df584b9cda9ca6e52942d0
Author: Campbell Barton
Date: Mon Nov 5 11:57:37 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB642fe9e0f2a9585084df584b9cda9ca6e52942d0
PyAPI: use keywords for ToolDef.from_fn.with_args
Enforces explicit names,
allows for keywords to be forwarded to the dictionary.
===================================================================
M release/scripts/startup/bl_ui/space_toolsystem_common.py
M release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
===================================================================
diff --git a/release/scripts/startup/bl_ui/space_toolsystem_common.py b/release/scripts/startup/bl_ui/space_toolsystem_common.py
index 79da1ee786e..b034b99d8b3 100644
--- a/release/scripts/startup/bl_ui/space_toolsystem_common.py
+++ b/release/scripts/startup/bl_ui/space_toolsystem_common.py
@@ -143,9 +143,9 @@ def from_fn(fn):
return ToolDef.from_dict(fn())
-def with_args(*args):
+def with_args(**kw):
def from_fn(fn):
- return ToolDef.from_dict(fn(*args))
+ return ToolDef.from_dict(fn(**kw))
return from_fn
diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
index 58e0d174e66..48284f89d59 100644
--- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
@@ -211,8 +211,8 @@ def _defs_annotate_factory():
elif tool_settings.gpencil_stroke_placement_view3d in {'SURFACE', 'STROKE'}:
row.prop(tool_settings, "use_gpencil_stroke_endpoints")
- @ToolDef.from_fn.with_args(draw_settings_common)
- def scribble(draw_settings_common):
+ @ToolDef.from_fn.with_args(draw_settings=draw_settings_common)
+ def scribble(*, draw_settings):
return dict(
text="Annotate",
icon="ops.gpencil.draw",
@@ -222,11 +222,11 @@ def _defs_annotate_factory():
dict(mode='DRAW', wait_for_input=False),
dict(type='ACTIONMOUSE', value='PRESS')),
),
- draw_settings=draw_settings_common,
+ draw_settings=draw_settings,
)
- @ToolDef.from_fn.with_args(draw_settings_common)
- def line(draw_settings_common):
+ @ToolDef.from_fn.with_args(draw_settings=draw_settings_common)
+ def line(*, draw_settings):
return dict(
text="Annotate Line",
icon="ops.gpencil.draw.line",
@@ -236,11 +236,11 @@ def _defs_annotate_factory():
dict(mode='DRAW_STRAIGHT', wait_for_input=False),
dict(type='EVT_TWEAK_A', value='ANY')),
),
- draw_settings=draw_settings_common,
+ draw_settings=draw_settings,
)
- @ToolDef.from_fn.with_args(draw_settings_common)
- def poly(draw_settings_common):
+ @ToolDef.from_fn.with_args(draw_settings=draw_settings_common)
+ def poly(*, draw_settings):
return dict(
text="Annotate Polygon",
icon="ops.gpencil.draw.poly",
@@ -250,7 +250,7 @@ def _defs_annotate_factory():
dict(mode='DRAW_POLY', wait_for_input=False),
dict(type='ACTIONMOUSE', value='PRESS')),
),
- draw_settings=draw_settings_common,
+ draw_settings=draw_settings,
)
@ToolDef.from_fn
@@ -1415,8 +1415,8 @@ class _defs_gpencil_sculpt:
row.separator()
row.prop(brush, "direction", expand=True, text="")
- @ToolDef.from_fn.with_args(draw_settings_common)
- def smooth(draw_settings_common):
+ @ToolDef.from_fn.with_args(draw_settings=draw_settings_common)
+ def smooth(*, draw_settings):
return dict(
text="Smooth",
icon="ops.gpencil.sculpt_smooth",
@@ -1426,11 +1426,11 @@ class _defs_gpencil_sculpt:
dict(mode='SMOOTH', wait_for_input=False),
dict(type='EVT_TWEAK_A', value='ANY')),
),
- draw_settings=draw_settings_common,
+ draw_settings=draw_settings,
)
- @ToolDef.from_fn.with_args(draw_settings_common)
- def thickness(draw_settings_common):
+ @ToolDef.from_fn.with_args(draw_settings=draw_settings_common)
+ def thickness(*, draw_settings):
return dict(
text="Thickness",
icon="ops.gpencil.sculpt_thickness",
@@ -1440,11 +1440,11 @@ class _defs_gpencil_sculpt:
dict(mode='THICKNESS', wait_for_input=False),
dict(type='EVT_TWEAK_A', value='ANY')),
),
- draw_settings=draw_settings_common,
+ draw_settings=draw_settings,
)
- @ToolDef.from_fn.with_args(draw_settings_common)
- def strength(draw_settings_common):
+ @ToolDef.from_fn.with_args(draw_settings=draw_settings_common)
+ def strength(*, draw_settings):
return dict(
text="Strength",
icon="ops.gpencil.sculpt_strength",
@@ -1454,11 +1454,11 @@ class _defs_gpencil_sculpt:
dict(mode='STRENGTH', wait_for_input=False),
dict(type='EVT_TWEAK_A', value='ANY')),
),
- draw_settings=draw_settings_common,
+ draw_settings=draw_settings,
)
- @ToolDef.from_fn.with_args(draw_settings_common)
- def grab(draw_settings_common):
+ @ToolDef.from_fn.with_args(draw_settings=draw_settings_common)
+ def grab(*, draw_settings):
return dict(
text="Grab",
icon="ops.gpencil.sculpt_grab",
@@ -1468,11 +1468,11 @@ class _defs_gpencil_sculpt:
dict(mode='GRAB', wait_for_input=False),
dict(type='EVT_TWEAK_A', value='ANY')),
),
- draw_settings=draw_settings_common,
+ draw_settings=draw_settings,
)
- @ToolDef.from_fn.with_args(draw_settings_common)
- def push(draw_settings_common):
+ @ToolDef.from_fn.with_args(draw_settings=draw_settings_common)
+ def push(*, draw_settings):
return dict(
text="Push",
icon="ops.gpencil.sculpt_push",
@@ -1482,11 +1482,11 @@ class _defs_gpencil_sculpt:
dict(mode='PUSH', wait_for_input=False),
dict(type='EVT_TWEAK_A', value='ANY')),
),
- draw_settings=draw_settings_common,
+ draw_settings=draw_settings,
)
- @ToolDef.from_fn.with_args(draw_settings_common)
- def twist(draw_settings_common):
+ @ToolDef.from_fn.with_args(draw_settings=draw_settings_common)
+ def twist(*, draw_settings):
return dict(
text="Twist",
icon="ops.gpencil.sculpt_twist",
@@ -1496,11 +1496,11 @@ class _defs_gpencil_sculpt:
dict(mode='TWIST', wait_for_input=False),
dict(type='EVT_TWEAK_A', value='ANY')),
),
- draw_settings=draw_settings_common,
+ draw_settings=draw_settings,
)
- @ToolDef.from_fn.with_args(draw_settings_common)
- def pinch(draw_settings_common):
+ @ToolDef.from_fn.with_args(draw_settings=draw_settings_common)
+ def pinch(*, draw_settings):
return dict(
text="Pinch",
icon="ops.gpencil.sculpt_pinch",
@@ -1510,11 +1510,11 @@ class _defs_gpencil_sculpt:
dict(mode='PINCH', wait_for_input=False),
dict(type='EVT_TWEAK_A', value='ANY')),
),
- draw_settings=draw_settings_common,
+ draw_settings=draw_settings,
)
- @ToolDef.from_fn.with_args(draw_settings_common)
- def randomize(draw_settings_common):
+ @ToolDef.from_fn.with_args(draw_settings=draw_settings_common)
+ def randomize(*, draw_settings):
return dict(
text="Randomize",
icon="ops.gpencil.sculpt_randomize",
@@ -1524,11 +1524,11 @@ class _defs_gpencil_sculpt:
dict(mode='RANDOMIZE', wait_for_input=False),
dict(type='EVT_TWEAK_A', value='ANY')),
),
- draw_settings=draw_settings_common,
+ draw_settings=draw_settings,
)
- @ToolDef.from_fn.with_args(draw_settings_common)
- def clone(draw_settings_common):
+ @ToolDef.from_fn.with_args(draw_settings=draw_settings_common)
+ def clone(*, draw_settings):
return dict(
text="Clone",
icon="ops.gpencil.sculpt_clone",
@@ -1538,7 +1538,7 @@ class _defs_gpencil_sculpt:
dict(mode='CLONE', wait_for_input=False),
dict(type='EVT_TWEAK_A', value='ANY')),
),
- draw_settings=draw_settings_common,
+ draw_settings=draw_settings,
)
@@ -1556,8 +1556,8 @@ class _defs_gpencil_weight:
row.prop(brush, "strength", slider=True)
row.prop(brush, "use_pressure_strength", text="")
- @ToolDef.from_fn.with_args(draw_settings_common)
- def paint(draw_settings_common):
+ @ToolDef.from_fn.with_args(draw_settings=draw_settings_common)
+ def paint(*, draw_settings):
return dict(
text="Draw",
icon="ops.gpencil.sculpt_weight",
@@ -1567,7 +1567,7 @@ class _defs_gpencil_weight:
dict(mode='WEIGHT', wait_for_input=False),
dict(type='EVT_TWEAK_A', value='ANY')),
),
- draw_settings=draw_settings_common,
+ draw_settings=draw_settings,
)
More information about the Bf-blender-cvs
mailing list