diff options
author | Dalai Felinto <dalai@blender.org> | 2020-12-17 19:39:49 +0300 |
---|---|---|
committer | Dalai Felinto <dalai@blender.org> | 2020-12-17 19:39:49 +0300 |
commit | 42b0389a9b05e51e17ba79540e88cd446b52fae7 (patch) | |
tree | ee17716640f1b1133ae2ab4ca65cd92a63d09f15 /release/scripts/startup/bl_ui/space_toolsystem_toolbar.py | |
parent | c5a17d5ea1ff786cb91cbcf3f12cd02f730c4143 (diff) | |
parent | e7b698327cd91b371ff4fd43d1c117637224fded (diff) |
Merge remote-tracking branch 'origin/master' into geometry-nodesgeometry-nodes
Diffstat (limited to 'release/scripts/startup/bl_ui/space_toolsystem_toolbar.py')
-rw-r--r-- | release/scripts/startup/bl_ui/space_toolsystem_toolbar.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py index ca5e6404159..0411d5c64bc 100644 --- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py +++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py @@ -360,7 +360,7 @@ class _defs_transform: idname="builtin.transform", label="Transform", description=( - "Supports any combination of grab, rotate & scale at once" + "Supports any combination of grab, rotate, and scale at once" ), icon="ops.transform.transform", widget="VIEW3D_GGT_xform_gizmo", @@ -1654,7 +1654,7 @@ class _defs_image_uv_transform: idname="builtin.transform", label="Transform", description=( - "Supports any combination of grab, rotate & scale at once" + "Supports any combination of grab, rotate, and scale at once" ), icon="ops.transform.transform", widget="IMAGE_GGT_gizmo2d", @@ -2903,10 +2903,10 @@ class SEQUENCER_PT_tools_active(ToolSelectPanelHelper, Panel): _defs_sequencer_generic.blade, ], 'SEQUENCER_PREVIEW': [ - _defs_sequencer_generic.sample, *_tools_select, - *_tools_annotate, _defs_sequencer_generic.blade, + _defs_sequencer_generic.sample, + *_tools_annotate, ], } |