[Bf-blender-cvs] [629a5dfb421] greasepencil-object: UI: Change Pin icon location

[Antonio Vazquez]

Commit: 629a5dfb421fbc7be71d918e527487a8cc998ff4
Author: Antonio Vazquez
Date:   Sat Mar 3 16:18:18 2018 +0100
Branches: greasepencil-object
https://developer.blender.org/rB629a5dfb421fbc7be71d918e527487a8cc998ff4

UI: Change Pin icon location

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

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 e2f890223ad..80f7b76eb45 100644
--- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
@@ -2087,8 +2087,10 @@ class VIEW3D_PT_tools_grease_pencil_brush(Panel):
 
         # Brush details
         if brush is not None:
-            layout.prop(brush, "name", text="")
-            # layout.separator()
+            row = layout.row()
+            row.prop(brush, "name", text="")
+            if brush.type == 'ERASE':
+                row.prop(brush, "default_eraser", text="")
 
             layout.prop(brush, "type", expand=True)
 
@@ -2123,9 +2125,8 @@ class VIEW3D_PT_tools_grease_pencil_brush(Panel):
 
             if brush.type == 'ERASE':
                 col = layout.column(align=True)
-                row = col.row(align=True)
-                row.prop(brush, "line_width", text="Radius")
-                row.prop(brush, "default_eraser", text="")
+                col.prop(brush, "line_width", text="Radius")
+
                 col.separator()
                 row = col.row()
                 row.prop(brush, "eraser_mode", expand=True)