From b5985831e2764a228f41a33c67a91cdb2cb7533b Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 29 Apr 2018 17:38:17 +0200 Subject: [PATCH] UI: show add/subtract as icons Saves space in the topbar --- release/scripts/startup/bl_ui/space_topbar.py | 6 +++--- source/blender/makesrna/intern/rna_brush.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/release/scripts/startup/bl_ui/space_topbar.py b/release/scripts/startup/bl_ui/space_topbar.py index 4cf302e1c93..b0a3be18fad 100644 --- a/release/scripts/startup/bl_ui/space_topbar.py +++ b/release/scripts/startup/bl_ui/space_topbar.py @@ -187,9 +187,9 @@ class _draw_left_context_mode: from .properties_paint_common import UnifiedPaintPanel - UnifiedPaintPanel.prop_unified_size(layout, context, brush, "size", icon='LOCKED', slider=True, text="Radius") - UnifiedPaintPanel.prop_unified_strength(layout, context, brush, "strength", icon='LOCKED', slider=True, text="Strength") - layout.prop(brush, "direction", expand=True) + UnifiedPaintPanel.prop_unified_size(layout, context, brush, "size", slider=True, text="Radius") + UnifiedPaintPanel.prop_unified_strength(layout, context, brush, "strength", slider=True, text="Strength") + layout.prop(brush, "direction", text="", expand=True) class TOPBAR_PT_redo(Panel): bl_label = "Redo" diff --git a/source/blender/makesrna/intern/rna_brush.c b/source/blender/makesrna/intern/rna_brush.c index 1ad33b683b7..d227d7a3dbe 100644 --- a/source/blender/makesrna/intern/rna_brush.c +++ b/source/blender/makesrna/intern/rna_brush.c @@ -44,8 +44,8 @@ #include "WM_types.h" static const EnumPropertyItem prop_direction_items[] = { - {0, "ADD", 0, "Add", "Add effect of brush"}, - {BRUSH_DIR_IN, "SUBTRACT", 0, "Subtract", "Subtract effect of brush"}, + {0, "ADD", ICON_ZOOMIN, "Add", "Add effect of brush"}, + {BRUSH_DIR_IN, "SUBTRACT", ICON_ZOOMOUT, "Subtract", "Subtract effect of brush"}, {0, NULL, 0, NULL, NULL} };