Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'intern/cycles/blender/addon')
-rw-r--r--intern/cycles/blender/addon/ui.py11
1 files changed, 4 insertions, 7 deletions
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"