diff options
author | Julian Eisel <eiseljulian@gmail.com> | 2015-05-15 02:25:03 +0300 |
---|---|---|
committer | Julian Eisel <eiseljulian@gmail.com> | 2015-05-15 02:25:03 +0300 |
commit | a92d8a34a82550fff5032bb224dbe355ecdb75c4 (patch) | |
tree | c5099280d0124b194c329d8fc69242681b54a7f1 /intern | |
parent | 7549ec7301cf051931878180eba52da16bc4c4ad (diff) |
Add material reorder buttons for Cycles as well
Diffstat (limited to 'intern')
-rw-r--r-- | intern/cycles/blender/addon/ui.py | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py index b5ce5a4e3cd..d24099b92a5 100644 --- a/intern/cycles/blender/addon/ui.py +++ b/intern/cycles/blender/addon/ui.py @@ -552,11 +552,16 @@ class Cycles_PT_context_material(CyclesButtonsPanel, Panel): ob = context.object slot = context.material_slot space = context.space_data + is_sortable = len(ob.material_slots) > 1 if ob: + rows = 1 + if (is_sortable): + rows = 4 + row = layout.row() - row.template_list("MATERIAL_UL_matslots", "", ob, "material_slots", ob, "active_material_index", rows=1) + row.template_list("MATERIAL_UL_matslots", "", ob, "material_slots", ob, "active_material_index", rows=rows) col = row.column(align=True) col.operator("object.material_slot_add", icon='ZOOMIN', text="") @@ -564,6 +569,12 @@ class Cycles_PT_context_material(CyclesButtonsPanel, Panel): col.menu("MATERIAL_MT_specials", icon='DOWNARROW_HLT', text="") + if is_sortable: + col.separator() + + col.operator("object.material_slot_move", icon='TRIA_UP', text="").direction = 'UP' + col.operator("object.material_slot_move", icon='TRIA_DOWN', text="").direction = 'DOWN' + if ob.mode == 'EDIT': row = layout.row(align=True) row.operator("object.material_slot_assign", text="Assign") |