[Bf-blender-cvs] [915e414c866] greasepencil-object: Use live icons to template_ID for graese pencil materials

Antonio Vazquez noreply at git.blender.org
Mon Jul 16 13:54:32 CEST 2018


Commit: 915e414c866be1d27310ed4f5a5805b4d573e883
Author: Antonio Vazquez
Date:   Mon Jul 16 13:54:22 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB915e414c866be1d27310ed4f5a5805b4d573e883

Use live icons to template_ID for graese pencil materials

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

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

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

diff --git a/release/scripts/startup/bl_ui/properties_material_gpencil.py b/release/scripts/startup/bl_ui/properties_material_gpencil.py
index e7686f44710..1202812d29d 100644
--- a/release/scripts/startup/bl_ui/properties_material_gpencil.py
+++ b/release/scripts/startup/bl_ui/properties_material_gpencil.py
@@ -140,7 +140,7 @@ class MATERIAL_PT_gpencil_slots(Panel):
         row = layout.row()
 
         if ob:
-            row.template_ID(ob, "active_material", new="material.new")
+            row.template_ID(ob, "active_material", new="material.new", live_icon=True)
 
             if slot:
                 icon_link = 'MESH_DATA' if slot.link == 'DATA' else 'OBJECT_DATA'
diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
index 2e070557861..a770b567c9b 100644
--- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
@@ -994,7 +994,7 @@ class _defs_gpencil_paint:
         row = layout.row(align=True)
         row.prop(ts, "use_gpencil_compact_list", text="", icon="SORTSIZE")
         if ts.use_gpencil_compact_list is True:
-            row.template_ID(gp_settings, "material")
+            row.template_ID(gp_settings, "material", live_icon=True)
         else:
             row.template_greasepencil_color(gp_settings, "material", rows=3, cols=8, scale=0.8)



More information about the Bf-blender-cvs mailing list