[Bf-blender-cvs] [2b0a83bc78c] greasepencil-object: UI: Make list of colors preview more compact

[Antonio Vazquez]

Commit: 2b0a83bc78c46604a3ee839b20d8c241311493e6
Author: Antonio Vazquez
Date:   Sat Jul 14 16:15:26 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB2b0a83bc78c46604a3ee839b20d8c241311493e6

UI: Make list of colors preview more compact

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

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

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

diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
index d075d82de5a..025093cef1f 100644
--- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
@@ -989,6 +989,8 @@ class _defs_gpencil_paint:
     @classmethod
     def draw_settings_common(cls, context, layout, tool):
         ob = context.active_object
+        nrow = 2
+        ncol = 8
         if ob and ob.mode == 'GPENCIL_PAINT':
             brush = context.active_gpencil_brush
             gp_settings = brush.gpencil_settings
@@ -1003,7 +1005,7 @@ class _defs_gpencil_paint:
                 row.prop(gp_settings, "gpencil_fill_simplyfy_level", text="Simplify")
 
                 row = layout.row()
-                row.template_greasepencil_color(gp_settings, "material", rows=3, cols=8)
+                row.template_greasepencil_color(gp_settings, "material", rows=nrow, cols=ncol)
 
                 row = layout.row(align=True)
                 row.prop(gp_settings, "gpencil_fill_draw_mode", text="")
@@ -1018,7 +1020,7 @@ class _defs_gpencil_paint:
                 row.prop(gp_settings, "use_strength_pressure", text="", icon='STYLUS_PRESSURE')
 
                 row = layout.row(align=True)
-                row.template_greasepencil_color(gp_settings, "material", rows=3, cols=8)
+                row.template_greasepencil_color(gp_settings, "material", rows=nrow, cols=ncol)
 
     @staticmethod
     def generate_from_brushes(context):