[Bf-blender-cvs] [dd4e968bead] greasepencil-object: UI: Move brush type to appearance panel

Antonio Vazquez noreply at git.blender.org
Mon Mar 19 19:43:40 CET 2018


Commit: dd4e968bead2a0edd6445ddebe0ee5e36e4d586b
Author: Antonio Vazquez
Date:   Mon Mar 19 19:43:28 2018 +0100
Branches: greasepencil-object
https://developer.blender.org/rBdd4e968bead2a0edd6445ddebe0ee5e36e4d586b

UI: Move brush type to appearance panel

This option is not used all the time and putting in the main panel, near of the brush selector, can be weird for the user.

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

M	release/scripts/startup/bl_ui/space_view3d_toolbar.py

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

diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
index 12b833c60f6..c68ba3edeba 100644
--- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
@@ -2074,11 +2074,9 @@ class VIEW3D_PT_tools_grease_pencil_brush(Panel):
         col.template_ID_preview(settings, "brush", new="brush.add_gpencil", rows=3, cols=8)
 
         col = row.column()
-        sub = col.column(align=True)
         brush = context.active_gpencil_brush
-        if brush is not None:
-            sub.prop(brush, "gpencil_brush_type", text="", icon_only=True, expand=True)
 
+        sub = col.column(align=True)
         sub.operator("gpencil.brush_presets_create", icon='HELP', text="")
 
         # Brush details
@@ -2509,6 +2507,10 @@ class VIEW3D_PT_tools_grease_pencil_appearance(Panel):
         col = layout.column()
         if workspace.object_mode == 'GPENCIL_PAINT':
             drawingbrush = context.active_gpencil_brush
+            col.label("Brush Type:")
+            col.prop(drawingbrush, "gpencil_brush_type", text="")
+            col.separator()
+
             col.prop(drawingbrush, "use_cursor", text="Show Brush")
 
             if drawingbrush.gpencil_brush_type == 'FILL':



More information about the Bf-blender-cvs mailing list