[Bf-blender-cvs] [c2c802f505c] greasepencil-object: Replace UI list by icon preview for brushes

Antonio Vazquez noreply at git.blender.org
Sun Jun 11 15:51:27 CEST 2017


Commit: c2c802f505c7ef75776622f77f9abbcdbec5ef42
Author: Antonio Vazquez
Date:   Sun Jun 11 15:43:29 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rBc2c802f505c7ef75776622f77f9abbcdbec5ef42

Replace UI list by icon preview for brushes

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

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 1a4ce4aaa87..aa450367dfb 100644
--- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
+++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
@@ -301,18 +301,13 @@ class GreasePencilBrushPanel:
     @staticmethod
     def draw(self, context):
         layout = self.layout
-
         row = layout.row()
         col = row.column()
+
         ts = context.scene.tool_settings
-        if len(ts.gpencil_brushes) >= 2:
-            brows = 3
-        else:
-            brows = 2
-        col.template_list("GPENCIL_UL_brush", "", ts, "gpencil_brushes", ts.gpencil_brushes, "active_index", rows=brows)
+        col.template_icon_view(ts, "gpencil_brushes_enum", show_labels=True)
 
         col = row.column()
-
         sub = col.column(align=True)
         sub.operator("gpencil.brush_add", icon='ZOOMIN', text="")
         sub.operator("gpencil.brush_remove", icon='ZOOMOUT', text="")
@@ -328,6 +323,8 @@ class GreasePencilBrushPanel:
         # Brush details
         if brush is not None:
             row = layout.row()
+            row.prop(brush, "name", text='')
+            row = layout.row()
             row.prop(brush, "line_width")
             row = layout.row(align=True)
             row.prop(brush, "use_random_pressure", text='', icon='RNDCURVE')




More information about the Bf-blender-cvs mailing list