[Bf-blender-cvs] [b4a4cbe7bb4] greasepencil-object: Cleanup: Simplify logic

[Joshua Leung]

Commit: b4a4cbe7bb41c0189ca05f86e4e2fb1afb95d90c
Author: Joshua Leung
Date:   Tue May 8 11:39:36 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rBb4a4cbe7bb41c0189ca05f86e4e2fb1afb95d90c

Cleanup: Simplify logic

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

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 4dfbb41efe1..9a27582ad9b 100644
--- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
@@ -1337,23 +1337,20 @@ class VIEW3D_PT_tools_grease_pencil_brush(Panel):
         sub = col.column(align=True)
         sub.operator("gpencil.brush_presets_create", icon='HELP', text="")
 
-        # Brush details
         if brush is not None:
+            # XXX: Items in "sub" currently show up beside the brush selector in a separate column
             if brush.gpencil_brush_type == 'ERASE':
                 sub.prop(brush, "default_eraser", text="")
 
-            if brush.gpencil_brush_type == 'DRAW':
-                row = layout.row(align=True)
-                row.prop(brush, "line_width", text="Radius")
-                row.prop(brush, "use_pressure", text="", icon='STYLUS_PRESSURE')
-                row = layout.row(align=True)
-                row.prop(brush, "pen_strength", slider=True)
-                row.prop(brush, "use_strength_pressure", text="", icon='STYLUS_PRESSURE')
-
-                row = layout.row(align=True)
-                row.template_ID(brush, "material")
+            # Brush details
+            if brush.gpencil_brush_type == 'ERASE':
+                col = layout.column(align=True)
+                col.prop(brush, "line_width", text="Radius")
 
-            if brush.gpencil_brush_type == 'FILL':
+                col.separator()
+                row = col.row()
+                row.prop(brush, "eraser_mode", expand=True)
+            elif brush.gpencil_brush_type == 'FILL':
                 col = layout.column(align=True)
                 col.prop(brush, "gpencil_fill_leak", text="Leak Size")
                 col.prop(brush, "line_width", text="Thickness")
@@ -1374,20 +1371,23 @@ class VIEW3D_PT_tools_grease_pencil_brush(Panel):
                 sub = col.row(align=True)
                 sub.enabled = brush.gpencil_fill_hide
                 sub.prop(brush, "gpencil_fill_threshold", text="Threshold")
+            else: # brush.gpencil_brush_type == 'DRAW':
+                row = layout.row(align=True)
+                row.prop(brush, "line_width", text="Radius")
+                row.prop(brush, "use_pressure", text="", icon='STYLUS_PRESSURE')
+                row = layout.row(align=True)
+                row.prop(brush, "pen_strength", slider=True)
+                row.prop(brush, "use_strength_pressure", text="", icon='STYLUS_PRESSURE')
 
-            if brush.gpencil_brush_type == 'ERASE':
-                col = layout.column(align=True)
-                col.prop(brush, "line_width", text="Radius")
-
-                col.separator()
-                row = col.row()
-                row.prop(brush, "eraser_mode", expand=True)
+                row = layout.row(align=True)
+                row.template_ID(brush, "material")
 
             if brush.gpencil_brush_type != 'ERASE':
                 layout.separator()
                 layout.prop(context.tool_settings, "use_gpencil_draw_onback", text="Draw on Back")
 
 
+
 # Grease Pencil drawing brushes options
 class VIEW3D_PT_tools_grease_pencil_brush_option(Panel):
     bl_space_type = 'VIEW_3D'