kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Add material reorder buttons for Cycles as well

Browse Source
This commit is contained in:
Julian Eisel 2015-05-15 01:25:03 +02:00
parent 7549ec7301
commit a92d8a34a8
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
intern/cycles/blender/addon/ui.py
View File

@ -552,11 +552,16 @@ class Cycles_PT_context_material(CyclesButtonsPanel, Panel):
ob = context.object ob = context.object
slot = context.material_slot slot = context.material_slot
space = context.space_data space = context.space_data
is_sortable = len(ob.material_slots) > 1
if ob: if ob:
rows = 1
if (is_sortable):
rows = 4
row = layout.row() 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 = row.column(align=True)
col.operator("object.material_slot_add", icon='ZOOMIN', text="") 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="") 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': if ob.mode == 'EDIT':
row = layout.row(align=True) row = layout.row(align=True)
row.operator("object.material_slot_assign", text="Assign") row.operator("object.material_slot_assign", text="Assign")