[Bf-blender-cvs] [5f3bcba63ee] greasepencil-object: UI: Change brush type icon and panel layout

Antonio Vazquez noreply at git.blender.org
Mon Mar 12 16:34:53 CET 2018


Commit: 5f3bcba63ee4b961c0415fb450afa592aeddae8f
Author: Antonio Vazquez
Date:   Mon Mar 12 16:34:39 2018 +0100
Branches: greasepencil-object
https://developer.blender.org/rB5f3bcba63ee4b961c0415fb450afa592aeddae8f

UI: Change brush type icon and panel layout

Small modifications to some parameters and added text to type of brush.

===================================================================

M	release/scripts/startup/bl_ui/space_view3d_toolbar.py
M	source/blender/makesrna/intern/rna_brush.c

===================================================================

diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
index def6c45b23b..64868af2b6e 100644
--- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
@@ -2077,7 +2077,7 @@ class VIEW3D_PT_tools_grease_pencil_brush(Panel):
         sub = col.column(align=True)
         brush = context.active_gpencil_brush
         if brush is not None:
-            sub.prop(brush, "gpencil_brush_type", text="")
+            sub.prop(brush, "gpencil_brush_type", text="", icon_only=True)
 
         sub.operator("gpencil.brush_presets_create", icon='HELP', text="")
 
@@ -2150,9 +2150,10 @@ class VIEW3D_PT_tools_grease_pencil_brush_option(Panel):
         brush = context.active_gpencil_brush
         if brush is not None:
             col = layout.column(align=True)
-            row = col.row()
-            row.prop(brush, "input_samples")
-            row.prop(brush, "active_smooth_factor")
+            col.prop(brush, "input_samples")
+            col.separator()
+
+            col.prop(brush, "active_smooth_factor")
             col.separator()
 
             if brush.gpencil_brush_type == 'DRAW':
diff --git a/source/blender/makesrna/intern/rna_brush.c b/source/blender/makesrna/intern/rna_brush.c
index 625edb65e81..63a04ef591c 100644
--- a/source/blender/makesrna/intern/rna_brush.c
+++ b/source/blender/makesrna/intern/rna_brush.c
@@ -127,9 +127,9 @@ const EnumPropertyItem rna_enum_brush_image_tool_items[] = {
 };
 
 static EnumPropertyItem rna_enum_gpencil_brush_types_items[] = {
-	{ GP_BRUSH_TYPE_DRAW, "DRAW", ICON_GREASEPENCIL, "", "The brush is of type used for drawing strokes" },
-	{ GP_BRUSH_TYPE_FILL, "FILL", ICON_COLOR, "", "The brush is of type used for filling areas" },
-	{ GP_BRUSH_TYPE_ERASE, "ERASE", ICON_PANEL_CLOSE, "", "The brush is used for erasing strokes" },
+	{ GP_BRUSH_TYPE_DRAW, "DRAW", ICON_GREASEPENCIL_STROKE_PAINT, "Draw", "The brush is of type used for drawing strokes" },
+	{ GP_BRUSH_TYPE_FILL, "FILL", ICON_COLOR, "Fill", "The brush is of type used for filling areas" },
+	{ GP_BRUSH_TYPE_ERASE, "ERASE", ICON_PANEL_CLOSE, "Erase", "The brush is used for erasing strokes" },
 	{ 0, NULL, 0, NULL, NULL }
 };



More information about the Bf-blender-cvs mailing list