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

Merged changes in the trunk up to revision 28536.

Browse Source
This commit is contained in:
Tamito Kajiyama
2010-05-02 23:10:22 +00:00
parent 51c8ead828 139f456bd1
commit a1d0913afe
623 changed files with 22402 additions and 21879 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
release/scripts/ui/properties_render.py
View File

@@ -96,13 +96,17 @@ class RENDER_PT_layers(RenderButtonsPanel):
split = layout.split()
col = split.column()
col.prop(scene, "visible_layers", text="Scene")
col.prop(scene, "layers", text="Scene")
col.label(text="")
col.prop(rl, "light_override", text="Light")
col.prop(rl, "material_override", text="Material")
if wide_ui:
col = split.column()
col.prop(rl, "visible_layers", text="Layer")
col.label(text="Mask Layers:")
col.prop(rl, "zmask_layers", text="")
layout.prop(rl, "light_override", text="Light")
layout.prop(rl, "material_override", text="Material")
layout.separator()
layout.label(text="Include:")
@@ -127,11 +131,6 @@ class RENDER_PT_layers(RenderButtonsPanel):
col.prop(rl, "strand")
col.prop(rl, "freestyle")
if rl.zmask:
split = layout.split()
split.label(text="Zmask Layers:")
split.column().prop(rl, "zmask_layers", text="")
layout.separator()
split = layout.split()
@@ -153,28 +152,28 @@ class RENDER_PT_layers(RenderButtonsPanel):
col.prop(rl, "pass_diffuse")
row = col.row()
row.prop(rl, "pass_specular")
row.prop(rl, "pass_specular_exclude", text="", icon='X')
row.prop(rl, "pass_specular_exclude", text="")
row = col.row()
row.prop(rl, "pass_shadow")
row.prop(rl, "pass_shadow_exclude", text="", icon='X')
row.prop(rl, "pass_shadow_exclude", text="")
row = col.row()
row.prop(rl, "pass_emit")
row.prop(rl, "pass_emit_exclude", text="", icon='X')
row.prop(rl, "pass_emit_exclude", text="")
row = col.row()
row.prop(rl, "pass_ao")
row.prop(rl, "pass_ao_exclude", text="", icon='X')
row.prop(rl, "pass_ao_exclude", text="")
row = col.row()
row.prop(rl, "pass_environment")
row.prop(rl, "pass_environment_exclude", text="", icon='X')
row.prop(rl, "pass_environment_exclude", text="")
row = col.row()
row.prop(rl, "pass_indirect")
row.prop(rl, "pass_indirect_exclude", text="", icon='X')
row.prop(rl, "pass_indirect_exclude", text="")
row = col.row()
row.prop(rl, "pass_reflection")
row.prop(rl, "pass_reflection_exclude", text="", icon='X')
row.prop(rl, "pass_reflection_exclude", text="")
row = col.row()
row.prop(rl, "pass_refraction")
row.prop(rl, "pass_refraction_exclude", text="", icon='X')
row.prop(rl, "pass_refraction_exclude", text="")
if rl.freestyle:
layout.separator()