diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-11-03 12:33:59 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-11-03 12:35:34 +0300 |
commit | f267921774ca0755040f73ea53319002a987c166 (patch) | |
tree | 91a523f8ab710c65ce35388974e69768b4373a43 /release | |
parent | e53cb83d079cb1a6d354d7c7e553b88a48507adc (diff) |
UI: remove grease pencil icons
Grease pencil tool now uses an icon for each tool,
previously it mapped icons to tool icons which is now not needed
because for each tool a different brush can be selected which has it's
own icon.
Diffstat (limited to 'release')
19 files changed, 2 insertions, 25 deletions
diff --git a/release/datafiles/icons/brush.gpencil.draw.eraser_soft.dat b/release/datafiles/icons/brush.gpencil.draw.eraser_soft.dat Binary files differdeleted file mode 100644 index 777e3aabe40..00000000000 --- a/release/datafiles/icons/brush.gpencil.draw.eraser_soft.dat +++ /dev/null diff --git a/release/datafiles/icons/brush.gpencil.draw.eraser_stroke.dat b/release/datafiles/icons/brush.gpencil.draw.eraser_stroke.dat Binary files differdeleted file mode 100644 index ad9216a2247..00000000000 --- a/release/datafiles/icons/brush.gpencil.draw.eraser_stroke.dat +++ /dev/null diff --git a/release/datafiles/icons/brush.gpencil.draw_block.dat b/release/datafiles/icons/brush.gpencil.draw_block.dat Binary files differdeleted file mode 100644 index fe4175c6d09..00000000000 --- a/release/datafiles/icons/brush.gpencil.draw_block.dat +++ /dev/null diff --git a/release/datafiles/icons/brush.gpencil.draw_ink.dat b/release/datafiles/icons/brush.gpencil.draw_ink.dat Binary files differdeleted file mode 100644 index 3137a3f431a..00000000000 --- a/release/datafiles/icons/brush.gpencil.draw_ink.dat +++ /dev/null diff --git a/release/datafiles/icons/brush.gpencil.draw_marker.dat b/release/datafiles/icons/brush.gpencil.draw_marker.dat Binary files differdeleted file mode 100644 index b0b821109a3..00000000000 --- a/release/datafiles/icons/brush.gpencil.draw_marker.dat +++ /dev/null diff --git a/release/datafiles/icons/brush.gpencil.draw_noise.dat b/release/datafiles/icons/brush.gpencil.draw_noise.dat Binary files differdeleted file mode 100644 index d29c0624704..00000000000 --- a/release/datafiles/icons/brush.gpencil.draw_noise.dat +++ /dev/null diff --git a/release/datafiles/icons/brush.gpencil.draw_pen.dat b/release/datafiles/icons/brush.gpencil.draw_pen.dat Binary files differdeleted file mode 100644 index d31e2055687..00000000000 --- a/release/datafiles/icons/brush.gpencil.draw_pen.dat +++ /dev/null diff --git a/release/datafiles/icons/brush.gpencil.draw_pencil.dat b/release/datafiles/icons/brush.gpencil_draw.draw.dat Binary files differindex 4643afc07e5..4643afc07e5 100644 --- a/release/datafiles/icons/brush.gpencil.draw_pencil.dat +++ b/release/datafiles/icons/brush.gpencil_draw.draw.dat diff --git a/release/datafiles/icons/brush.gpencil.draw.eraser_hard.dat b/release/datafiles/icons/brush.gpencil_draw.erase.dat Binary files differindex 3e1b77e4661..3e1b77e4661 100644 --- a/release/datafiles/icons/brush.gpencil.draw.eraser_hard.dat +++ b/release/datafiles/icons/brush.gpencil_draw.erase.dat diff --git a/release/datafiles/icons/brush.gpencil.draw_fill.dat b/release/datafiles/icons/brush.gpencil_draw.fill.dat Binary files differindex 82e6f6bbac9..82e6f6bbac9 100644 --- a/release/datafiles/icons/brush.gpencil.draw_fill.dat +++ b/release/datafiles/icons/brush.gpencil_draw.fill.dat diff --git a/release/datafiles/icons/brush.particle.weight.dat b/release/datafiles/icons/brush.particle.weight.dat Binary files differindex ee14fa4eda5..833bbca506b 100644 --- a/release/datafiles/icons/brush.particle.weight.dat +++ b/release/datafiles/icons/brush.particle.weight.dat diff --git a/release/datafiles/icons/ops.curve.draw.dat b/release/datafiles/icons/ops.curve.draw.dat Binary files differindex 5622b99a1f3..5228833daa3 100644 --- a/release/datafiles/icons/ops.curve.draw.dat +++ b/release/datafiles/icons/ops.curve.draw.dat diff --git a/release/datafiles/icons/ops.curve.extrude_cursor.dat b/release/datafiles/icons/ops.curve.extrude_cursor.dat Binary files differindex f2fd1f44cab..5ab67727f72 100644 --- a/release/datafiles/icons/ops.curve.extrude_cursor.dat +++ 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 differindex a63fa1fa525..cbd0eb5e620 100644 --- a/release/datafiles/icons/ops.curve.extrude_move.dat +++ b/release/datafiles/icons/ops.curve.extrude_move.dat diff --git a/release/datafiles/icons/ops.pose.breakdowner.dat b/release/datafiles/icons/ops.pose.breakdowner.dat Binary files differindex 0ccbad1f04d..25ba7bde2d9 100644 --- a/release/datafiles/icons/ops.pose.breakdowner.dat +++ 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 differindex e11f1d54254..2ab36223c96 100644 --- a/release/datafiles/icons/ops.pose.push.dat +++ 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 differindex 63158340e15..c3c8983eaa5 100644 --- a/release/datafiles/icons/ops.pose.relax.dat +++ 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 differindex b1735aa6c09..75084eb9fe1 100644 --- a/release/datafiles/icons/ops.transform.bone_envelope.dat +++ b/release/datafiles/icons/ops.transform.bone_envelope.dat diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py index 6d44ca95f03..d5019d1b5d8 100644 --- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py +++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py @@ -45,7 +45,6 @@ def generate_from_brushes_tool_slots_ex( brush_category_attr, brush_category_layout, # Optional - icon_fn=None, tooldef_keywords={}, ): # Categories @@ -55,18 +54,12 @@ def generate_from_brushes_tool_slots_ex( if brush is None: continue category = getattr(brush, brush_category_attr) - - if icon_fn is not None: - icon_id = icon_fn(brush) - else: - icon_id = category.lower() - name = brush.name brush_categories.setdefault(category, []).append( ToolDef.from_dict( dict( text=name, - icon=icon_prefix + icon_id, + icon=icon_prefix + category.lower(), data_block=name, **tooldef_keywords, ) @@ -1385,23 +1378,9 @@ class _defs_gpencil_paint: def draw_settings(context, layout, tool): _defs_gpencil_paint.draw_settings_common(context, layout, tool) - def icon_fn(brush): - return { - 'PENCIL': 'draw_pencil', - 'PEN': 'draw_pen', - 'INK': 'draw_ink', - 'INKNOISE': 'draw_noise', - 'BLOCK': 'draw_block', - 'MARKER': 'draw_marker', - 'FILL': 'draw_fill', - 'SOFT': 'draw.eraser_soft', - 'HARD': 'draw.eraser_hard', - 'STROKE': 'draw.eraser_stroke', - }[brush.gpencil_settings.gp_icon] - return generate_from_brushes_tool_slots_ex( context, context.tool_settings.gpencil_paint, - icon_prefix="brush.gpencil.", + icon_prefix="brush.gpencil_draw.", brush_category_attr="gpencil_tool", brush_category_layout=( ('DRAW',), @@ -1412,11 +1391,9 @@ class _defs_gpencil_paint: operator="gpencil.draw", draw_settings=draw_settings, ), - icon_fn=icon_fn, ) - class _defs_gpencil_edit: @ToolDef.from_fn def bend(): |