From 0052cbed0dadafce44f818d3d2016254c3d914d0 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Tue, 28 Feb 2012 16:44:45 +0000 Subject: Cycles: support for mask layers in render layer, this has the same effect as assigning holdout shaders to every object in the specified layers. http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Passes#Layers --- intern/cycles/blender/addon/ui.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'intern/cycles/blender/addon') diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py index c966792ed29..e006238a70d 100644 --- a/intern/cycles/blender/addon/ui.py +++ b/intern/cycles/blender/addon/ui.py @@ -177,11 +177,13 @@ class CyclesRender_PT_layers(CyclesButtonsPanel, Panel): col = split.column() col.prop(scene, "layers", text="Scene") + col.label(text="Material:") + col.prop(rl, "material_override", text="") col = split.column() col.prop(rl, "layers", text="Layer") - - layout.separator() + col.label(text="Mask Layers:") + col.prop(rl, "layers_zmask", text="") split = layout.split() @@ -213,11 +215,6 @@ class CyclesRender_PT_layers(CyclesButtonsPanel, Panel): row.prop(rl, "use_pass_transmission_indirect", text="Indirect", toggle=True) row.prop(rl, "use_pass_transmission_color", text="Color", toggle=True) - layout.separator() - - rl = rd.layers[0] - layout.prop(rl, "material_override", text="Material") - class Cycles_PT_post_processing(CyclesButtonsPanel, Panel): bl_label = "Post Processing" -- cgit v1.2.3