[Bf-blender-cvs] [751c8dfce38] greasepencil-object: UI: Replace color by material previews in list

Antonio Vazquez noreply at git.blender.org
Mon Jul 16 16:22:27 CEST 2018


Commit: 751c8dfce38cb31d67d246471c1f986da8bba4a5
Author: Antonio Vazquez
Date:   Mon Jul 16 16:22:19 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB751c8dfce38cb31d67d246471c1f986da8bba4a5

UI: Replace color by material previews in list

To make more consistent the UI, the list of colors must shows the preview, not the old color boxes.

Besides, the new materials are more complex that a simple color box and the image was not representative.

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

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

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

diff --git a/release/scripts/startup/bl_ui/properties_material_gpencil.py b/release/scripts/startup/bl_ui/properties_material_gpencil.py
index 1202812d29d..c7cc6f9298e 100644
--- a/release/scripts/startup/bl_ui/properties_material_gpencil.py
+++ b/release/scripts/startup/bl_ui/properties_material_gpencil.py
@@ -52,12 +52,9 @@ class GPENCIL_UL_matslots(UIList):
                 if gpcolor.lock:
                     layout.active = False
 
-                split = layout.split(percentage=0.25)
-                row = split.row(align=True)
+                row = layout.row(align=True)
                 row.enabled = not gpcolor.lock
-                row.prop(gpcolor, "color", text="", emboss=gpcolor.is_stroke_visible)
-                row.prop(gpcolor, "fill_color", text="", emboss=gpcolor.is_fill_visible)
-                split.prop(ma, "name", text="", emboss=False)
+                row.prop(ma, "name", text="", emboss=False, icon_value=icon)
 
                 row = layout.row(align=True)
                 row.prop(gpcolor, "lock", text="", emboss=False)



More information about the Bf-blender-cvs mailing list