From fd3ef61bc1364ff6af44141f4621f18a2bd57a4c Mon Sep 17 00:00:00 2001 From: William Reynish Date: Mon, 4 Mar 2019 09:50:59 +0100 Subject: Tools: Rename Curve Shrink/Fatten to Radius This is fundamentally different from Shrink/Fatten for meshes, because the control points are not moved, only the radius. Issue raised by Ronan Ducluzeau, name suggested by Campbell Barton --- release/datafiles/icons/ops.curve.radius.dat | Bin 0 -> 1466 bytes release/datafiles/icons/ops.curve.shrink_fatten.dat | Bin 1466 -> 0 bytes .../presets/keyconfig/keymap_data/blender_default.py | 6 +++--- .../scripts/startup/bl_ui/space_toolsystem_toolbar.py | 8 ++++---- source/blender/editors/datafiles/CMakeLists.txt | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) create mode 100644 release/datafiles/icons/ops.curve.radius.dat delete mode 100644 release/datafiles/icons/ops.curve.shrink_fatten.dat diff --git a/release/datafiles/icons/ops.curve.radius.dat b/release/datafiles/icons/ops.curve.radius.dat new file mode 100644 index 00000000000..1c887bc11e7 Binary files /dev/null and b/release/datafiles/icons/ops.curve.radius.dat differ diff --git a/release/datafiles/icons/ops.curve.shrink_fatten.dat b/release/datafiles/icons/ops.curve.shrink_fatten.dat deleted file mode 100644 index 1c887bc11e7..00000000000 Binary files a/release/datafiles/icons/ops.curve.shrink_fatten.dat and /dev/null differ diff --git a/release/scripts/presets/keyconfig/keymap_data/blender_default.py b/release/scripts/presets/keyconfig/keymap_data/blender_default.py index e490ab55d35..9c3c2b24e45 100644 --- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py +++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py @@ -5663,9 +5663,9 @@ def km_3d_view_tool_edit_curve_tilt(params): ) -def km_3d_view_tool_edit_curve_shrink_fatten(params): +def km_3d_view_tool_edit_curve_radius(params): return ( - "3D View Tool: Edit Curve, Shrink/Fatten", + "3D View Tool: Edit Curve, Radius", {"space_type": 'VIEW_3D', "region_type": 'WINDOW'}, {"items": [ ("transform.transform", {"type": params.tool_tweak, "value": 'ANY'}, @@ -6153,7 +6153,7 @@ def generate_keymaps(params=None): km_3d_view_tool_edit_mesh_rip_region(params), km_3d_view_tool_edit_mesh_rip_edge(params), km_3d_view_tool_edit_curve_draw(params), - km_3d_view_tool_edit_curve_shrink_fatten(params), + km_3d_view_tool_edit_curve_radius(params), km_3d_view_tool_edit_curve_tilt(params), km_3d_view_tool_edit_curve_randomize(params), km_3d_view_tool_edit_curve_extrude(params), diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py index 2092224ce73..28b560e04d0 100644 --- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py +++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py @@ -803,10 +803,10 @@ class _defs_edit_curve: ) @ToolDef.from_fn - def curve_shrink_fatten(): + def curve_radius(): return dict( - text="Shrink/Fatten", - icon="ops.curve.shrink_fatten", + text="Radius", + icon="ops.curve.radius", widget=None, keymap=(), ) @@ -1615,7 +1615,7 @@ class VIEW3D_PT_tools_active(ToolSelectPanelHelper, Panel): 'EDIT_CURVE': [ *_tools_default, None, - _defs_edit_curve.curve_shrink_fatten, + _defs_edit_curve.curve_radius, _defs_edit_curve.curve_vertex_randomize, _defs_edit_curve.tilt, _defs_edit_curve.draw, diff --git a/source/blender/editors/datafiles/CMakeLists.txt b/source/blender/editors/datafiles/CMakeLists.txt index 4ee57030a3d..c116254ebc9 100644 --- a/source/blender/editors/datafiles/CMakeLists.txt +++ b/source/blender/editors/datafiles/CMakeLists.txt @@ -668,7 +668,7 @@ set_property(GLOBAL PROPERTY ICON_GEOM_NAMES ops.curve.draw ops.curve.extrude_cursor ops.curve.extrude_move - ops.curve.shrink_fatten + ops.curve.radius ops.curve.vertex_random ops.generic.cursor ops.generic.select -- cgit v1.2.3