archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

2.5: Buttons Window

Browse Source 
* Fix poll() callback changes in recent commit, note that these have
  to work with pinned context too.
* Hide header for context panels in py layout.
* Don't jump back when collapsing a panel, allow the view to be
  over some empty space until you scroll back.
* Fix follow context icon, order had to be reversed in icon file.
* ID template now has icon as part of browse button instead of
  outside the buttons.
This commit is contained in:
Brecht Van Lommel
2009-07-09 19:45:27 +00:00
parent a2a04bab8a
commit d091856486
19 changed files with 5572 additions and 5612 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
release/ui/buttons_material.py
View File

@@ -21,7 +21,7 @@ class MATERIAL_PT_preview(MaterialButtonsPanel):
class MATERIAL_PT_context_material(MaterialButtonsPanel):
__idname__= "MATERIAL_PT_context_material"
__label__ = " "
__no_header__ = True
def poll(self, context):
return (context.object)
@@ -34,13 +34,14 @@ class MATERIAL_PT_context_material(MaterialButtonsPanel):
slot = context.material_slot
space = context.space_data
row = layout.row()
if ob:
row = layout.row()
row.template_list(ob, "materials", ob, "active_material_index")
row.template_list(ob, "materials", ob, "active_material_index")
col = row.column(align=True)
col.itemO("OBJECT_OT_material_slot_add", icon="ICON_ZOOMIN", text="")
col.itemO("OBJECT_OT_material_slot_remove", icon="ICON_ZOOMOUT", text="")
col = row.column(align=True)
col.itemO("OBJECT_OT_material_slot_add", icon="ICON_ZOOMIN", text="")
col.itemO("OBJECT_OT_material_slot_remove", icon="ICON_ZOOMOUT", text="")
split = layout.split(percentage=0.65)
@@ -188,11 +189,9 @@ class MATERIAL_PT_diffuse(MaterialButtonsPanel):
split.active = mat.shadeless== False
sub = split.column()
if mat.diffuse_shader == 'OREN_NAYAR':
sub.itemR(mat, "roughness")
sub = split.column()
sub.itemR(mat, "roughness")
if mat.diffuse_shader == 'MINNAERT':
sub.itemR(mat, "darkness")
sub = split.column()
if mat.diffuse_shader == 'TOON':
sub.itemR(mat, "diffuse_toon_size", text="Size")
sub = split.column()
@@ -232,13 +231,13 @@ class MATERIAL_PT_specular(MaterialButtonsPanel):
sub = split.column()
if mat.spec_shader in ('COOKTORR', 'PHONG'):
sub.itemR(mat, "specular_hardness", text="Hardness")
sub = split.column()
if mat.spec_shader == 'BLINN':
sub.itemR(mat, "specular_hardness", text="Hardness")
sub = split.column()
sub.itemR(mat, "specular_ior", text="IOR")
if mat.spec_shader == 'WARDISO':
sub.itemR(mat, "specular_slope", text="Slope")
sub = split.column()
sub.itemR(mat, "specular_hardness", text="Hardness")
if mat.spec_shader == 'TOON':
sub.itemR(mat, "specular_toon_size", text="Size")