[Bf-blender-cvs] [c98b4ee52db] greasepencil-object: UI: Cleanup Appearance panel

[Antonio Vazquez]

Commit: c98b4ee52db15cf3e47ece12979cd6470f7c1d46
Author: Antonio Vazquez
Date:   Fri Jun 15 09:52:54 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rBc98b4ee52db15cf3e47ece12979cd6470f7c1d46

UI: Cleanup Appearance panel

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

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

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

diff --git a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
index 3ae03708e25..cfd8926bf76 100644
--- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
+++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
@@ -298,20 +298,6 @@ class GreasePencilAppearancePanel:
     bl_label = "Brush Appearance"
     bl_options = {'DEFAULT_CLOSED'}
 
-    @classmethod
-    def poll(cls, context):
-        return True
-
-        # if context.gpencil_data is None:
-        #     return False
-        #
-        # workspace = context.workspace
-        # if context.active_object:
-        #     brush = context.active_gpencil_brush
-        #     return context.active_object.mode in {'GPENCIL_PAINT', 'GPENCIL_SCULPT', 'GPENCIL_WEIGHT'}
-        #
-        # return False
-
     @staticmethod
     def draw(self, context):
         layout = self.layout
@@ -323,24 +309,21 @@ class GreasePencilAppearancePanel:
             brush = context.active_gpencil_brush
             gp_settings = brush.gpencil_settings
 
-            col = layout.column(align=True)
-            col.prop(gp_settings, "gpencil_brush_type", text="Brush Type")
+            layout.prop(gp_settings, "gpencil_brush_type", text="Brush Type")
 
-            sub = col.column(align=True)
+            sub = layout.column(align=True)
             sub.enabled = not brush.use_custom_icon
             sub.prop(gp_settings, "gp_icon", text="Icon")
 
-            col.prop(brush, "use_custom_icon")
-            sub = col.column()
+            layout.prop(brush, "use_custom_icon")
+            sub = layout.column()
             sub.active = brush.use_custom_icon
             sub.prop(brush, "icon_filepath", text="")
 
-            col = layout.column(align=True)
-            col.prop(gp_settings, "use_cursor", text="Show Brush")
+            layout.prop(gp_settings, "use_cursor", text="Show Brush")
 
             if gp_settings.gpencil_brush_type == 'FILL':
-                row = col.row(align=True)
-                row.prop(brush, "cursor_color_add", text="Color")
+                layout.prop(brush, "cursor_color_add", text="Color")
 
         elif context.active_object.mode in ('GPENCIL_SCULPT', 'GPENCIL_WEIGHT'):
             settings = context.tool_settings.gpencil_sculpt
@@ -351,6 +334,7 @@ class GreasePencilAppearancePanel:
             col.row().prop(brush, "cursor_color_add", text="Add")
             col.row().prop(brush, "cursor_color_sub", text="Subtract")
 
+
 class GreasePencilAnimationPanel:
     bl_label = "Animation"