[Bf-blender-cvs] [5dd8c7fa424] greasepencil-object: More Brush Appearance Panel tweaks

[Joshua Leung]

Commit: 5dd8c7fa424f08305f300509a50bdff80fe03233
Author: Joshua Leung
Date:   Tue Mar 20 17:01:48 2018 +1300
Branches: greasepencil-object
https://developer.blender.org/rB5dd8c7fa424f08305f300509a50bdff80fe03233

More Brush Appearance Panel tweaks

* Always show this panel. Previously, it wouldn't get shown for the Eraser,
  meaning that if you accidentally changed a brush to an eraser, you couldn't
  change it back

* Always allow changing the brush icon. Previously, this could only be done
  for "Draw" brushes, but there isn't really any reason why this shouldn't
  be allowed.

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

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 12899933bec..32d32617d92 100644
--- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
@@ -2489,9 +2489,6 @@ class VIEW3D_PT_tools_grease_pencil_appearance(Panel):
         workspace = context.workspace
         if context.active_object:
             brush = context.active_gpencil_brush
-            if brush and brush.gpencil_brush_type == 'ERASE':
-                return False
-
             return workspace.object_mode in {'GPENCIL_PAINT', 'GPENCIL_SCULPT', 'GPENCIL_WEIGHT'}
             
         return False
@@ -2514,7 +2511,7 @@ class VIEW3D_PT_tools_grease_pencil_appearance(Panel):
             col = layout.column(align=True)
             col.label("Icon:")
             sub = col.column(align=True)
-            sub.enabled = brush.use_custom_icon is False and brush.gpencil_brush_type == 'DRAW'
+            sub.enabled = not brush.use_custom_icon
             sub.prop(brush, "gp_icon", text="")
 
             col.separator()