diff options
17 files changed, 13 insertions, 21 deletions
diff --git a/release/datafiles/icons/ops.armature.bone.roll.dat b/release/datafiles/icons/ops.armature.bone.roll.dat Binary files differindex db5eb1de211..a12f3a674ae 100644 --- a/release/datafiles/icons/ops.armature.bone.roll.dat +++ b/release/datafiles/icons/ops.armature.bone.roll.dat diff --git a/release/datafiles/icons/ops.armature.extrude_cursor.dat b/release/datafiles/icons/ops.armature.extrude_cursor.dat Binary files differnew file mode 100644 index 00000000000..ec8f2432052 --- /dev/null +++ b/release/datafiles/icons/ops.armature.extrude_cursor.dat diff --git a/release/datafiles/icons/ops.armature.extrude_move.dat b/release/datafiles/icons/ops.armature.extrude_move.dat Binary files differnew file mode 100644 index 00000000000..2194c5bf556 --- /dev/null +++ b/release/datafiles/icons/ops.armature.extrude_move.dat diff --git a/release/datafiles/icons/ops.curve.extrude_cursor.dat b/release/datafiles/icons/ops.curve.extrude_cursor.dat Binary files differnew file mode 100644 index 00000000000..f2fd1f44cab --- /dev/null +++ b/release/datafiles/icons/ops.curve.extrude_cursor.dat diff --git a/release/datafiles/icons/ops.curve.extrude_move.dat b/release/datafiles/icons/ops.curve.extrude_move.dat Binary files differnew file mode 100644 index 00000000000..a63fa1fa525 --- /dev/null +++ b/release/datafiles/icons/ops.curve.extrude_move.dat diff --git a/release/datafiles/icons/ops.generic.select_box.dat b/release/datafiles/icons/ops.generic.select_box.dat Binary files differindex eed66f3f680..3c1df5fe863 100644 --- a/release/datafiles/icons/ops.generic.select_box.dat +++ b/release/datafiles/icons/ops.generic.select_box.dat diff --git a/release/datafiles/icons/ops.generic.select_circle.dat b/release/datafiles/icons/ops.generic.select_circle.dat Binary files differindex 71877f45590..4d9b741a1bd 100644 --- a/release/datafiles/icons/ops.generic.select_circle.dat +++ b/release/datafiles/icons/ops.generic.select_circle.dat diff --git a/release/datafiles/icons/ops.generic.select_lasso.dat b/release/datafiles/icons/ops.generic.select_lasso.dat Binary files differindex cfd8a26b527..a42d3f9d6e4 100644 --- a/release/datafiles/icons/ops.generic.select_lasso.dat +++ b/release/datafiles/icons/ops.generic.select_lasso.dat diff --git a/release/datafiles/icons/ops.mesh.rip.dat b/release/datafiles/icons/ops.mesh.rip.dat Binary files differindex 1f1241907cf..b424e42469b 100644 --- a/release/datafiles/icons/ops.mesh.rip.dat +++ b/release/datafiles/icons/ops.mesh.rip.dat diff --git a/release/datafiles/icons/ops.mesh.rip_edge.dat b/release/datafiles/icons/ops.mesh.rip_edge.dat Binary files differindex d75f9822b80..925b90bd861 100644 --- a/release/datafiles/icons/ops.mesh.rip_edge.dat +++ b/release/datafiles/icons/ops.mesh.rip_edge.dat diff --git a/release/datafiles/icons/ops.pose.breakdowner.dat b/release/datafiles/icons/ops.pose.breakdowner.dat Binary files differnew file mode 100644 index 00000000000..0ccbad1f04d --- /dev/null +++ b/release/datafiles/icons/ops.pose.breakdowner.dat diff --git a/release/datafiles/icons/ops.pose.push.dat b/release/datafiles/icons/ops.pose.push.dat Binary files differnew file mode 100644 index 00000000000..e11f1d54254 --- /dev/null +++ b/release/datafiles/icons/ops.pose.push.dat diff --git a/release/datafiles/icons/ops.pose.relax.dat b/release/datafiles/icons/ops.pose.relax.dat Binary files differnew file mode 100644 index 00000000000..63158340e15 --- /dev/null +++ b/release/datafiles/icons/ops.pose.relax.dat diff --git a/release/datafiles/icons/ops.transform.bone_envelope.dat b/release/datafiles/icons/ops.transform.bone_envelope.dat Binary files differnew file mode 100644 index 00000000000..b1735aa6c09 --- /dev/null +++ b/release/datafiles/icons/ops.transform.bone_envelope.dat diff --git a/release/datafiles/icons/ops.transform.bone_size.dat b/release/datafiles/icons/ops.transform.bone_size.dat Binary files differnew file mode 100644 index 00000000000..f65a5ecf745 --- /dev/null +++ b/release/datafiles/icons/ops.transform.bone_size.dat diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py index b75a4fa09e2..7fe4aaaf1f3 100644 --- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py +++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py @@ -959,7 +959,7 @@ class _defs_edit_curve: return dict( text="Draw", cursor='PAINT_BRUSH', - icon=None, + icon="ops.curve.draw", widget=None, keymap=( ("curve.draw", dict(wait_for_input=False), dict(type='ACTIONMOUSE', value='PRESS')), @@ -971,7 +971,7 @@ class _defs_edit_curve: def extrude(): return dict( text="Extrude", - icon=None, + icon="ops.curve.extrude_move", widget=None, keymap=( ("curve.extrude_move", @@ -984,7 +984,7 @@ class _defs_edit_curve: def extrude_cursor(): return dict( text="Extrude Cursor", - icon=None, + icon="ops.curve.extrude_cursor", widget=None, keymap=( ("curve.vertex_add", dict(), dict(type='ACTIONMOUSE', value='PRESS')), @@ -1468,19 +1468,6 @@ class _defs_gpencil_edit: ) @ToolDef.from_fn - def mirror(): - return dict( - text="Mirror", - icon="ops.gpencil.edit_mirror", - widget=None, - keymap=( - ("transform.mirror", - dict(release_confirm=True), - dict(type='EVT_TWEAK_A', value='ANY')), - ), - ) - - @ToolDef.from_fn def shear(): return dict( text="Shear", @@ -1497,7 +1484,7 @@ class _defs_gpencil_edit: def tosphere(): return dict( text="To Sphere", - icon="ops.gpencil.edit_to_sphere", + icon="ops.transform.tosphere", widget=None, keymap=( ("transform.tosphere", @@ -2056,7 +2043,6 @@ class VIEW3D_PT_tools_active(ToolSelectPanelHelper, Panel): _defs_gpencil_edit.lasso_select, None, _defs_gpencil_edit.bend, - _defs_gpencil_edit.mirror, _defs_gpencil_edit.shear, _defs_gpencil_edit.tosphere, ], diff --git a/source/blender/editors/datafiles/CMakeLists.txt b/source/blender/editors/datafiles/CMakeLists.txt index 4e898d5654b..d4974b24034 100644 --- a/source/blender/editors/datafiles/CMakeLists.txt +++ b/source/blender/editors/datafiles/CMakeLists.txt @@ -663,10 +663,11 @@ set_property(GLOBAL PROPERTY ICON_GEOM_NAMES brush.weight.subtract none ops.armature.bone.roll - ops.armature.extrude.cursor - ops.armature.extrude + ops.armature.extrude_cursor + ops.armature.extrude_move ops.curve.draw - ops.curve.dupli_extrude_cursor + ops.curve.extrude_cursor + ops.curve.extrude_move ops.generic.cursor ops.generic.select_box ops.generic.select_circle @@ -714,8 +715,13 @@ set_property(GLOBAL PROPERTY ICON_GEOM_NAMES ops.paint.vertex_color_fill ops.paint.weight_fill ops.paint.weight_gradient + ops.pose.breakdowner + ops.pose.push + ops.pose.relax ops.sculpt.border_hide ops.sculpt.border_mask + ops.transform.bone_envelope + ops.transform.bone_size ops.transform.edge_slide ops.transform.push_pull ops.transform.resize.cage |