diff options
author | Thomas Dinges <blender@dingto.org> | 2013-04-07 03:05:32 +0400 |
---|---|---|
committer | Thomas Dinges <blender@dingto.org> | 2013-04-07 03:05:32 +0400 |
commit | 9c117ba54e6eb4ac8aa47dc8067fa0757925a2b6 (patch) | |
tree | 39fc8df6216d3abe160d5fc8a9346fa3081db1e5 /intern | |
parent | ce12370b79d670278bcfa0e135e0e4a8c343cd2b (diff) |
Properties Editor / Render Layers:
* Cycles Render layers UI was broken after freestyle merge (changes were not merged). Did manual edits now with some tweaks.
* Some layout fixes for Mask Layer.
Diffstat (limited to 'intern')
-rw-r--r-- | intern/cycles/blender/addon/ui.py | 40 |
1 files changed, 31 insertions, 9 deletions
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py index 6a9b242c32f..bd5e1b81ab6 100644 --- a/intern/cycles/blender/addon/ui.py +++ b/intern/cycles/blender/addon/ui.py @@ -244,28 +244,40 @@ class CyclesRender_PT_opengl(CyclesButtonsPanel, Panel): class CyclesRender_PT_layers(CyclesButtonsPanel, Panel): - bl_label = "Layers" - bl_options = {'DEFAULT_CLOSED'} - COMPAT_ENGINES = {'BLENDER_RENDER'} + bl_label = "Layer List" + bl_context = "render_layer" + bl_options = {'HIDE_HEADER'} def draw(self, context): layout = self.layout scene = context.scene rd = scene.render + rl = rd.layers.active row = layout.row() - row.template_list("RENDER_UL_renderlayers", "", rd, "layers", rd.layers, "active_index", rows=2) + row.template_list("RENDERLAYER_UL_renderlayers", "", rd, "layers", rd.layers, "active_index", rows=2) col = row.column(align=True) col.operator("scene.render_layer_add", icon='ZOOMIN', text="") col.operator("scene.render_layer_remove", icon='ZOOMOUT', text="") row = layout.row() - rl = rd.layers.active - row.prop(rl, "name") + if rl: + row.prop(rl, "name") row.prop(rd, "use_single_layer", text="", icon_only=True) +class CyclesRender_PT_layer_options(CyclesButtonsPanel, Panel): + bl_label = "Layer" + bl_context = "render_layer" + + def draw(self, context): + layout = self.layout + + scene = context.scene + rd = scene.render + rl = rd.layers.active + split = layout.split() col = split.column() @@ -274,8 +286,7 @@ class CyclesRender_PT_layers(CyclesButtonsPanel, Panel): col = split.column() col.prop(rl, "layers", text="Layer") - col.label(text="Mask Layers:") - col.prop(rl, "layers_zmask", text="") + col.prop(rl, "layers_zmask", text="Mask Layer") split = layout.split() @@ -286,11 +297,22 @@ class CyclesRender_PT_layers(CyclesButtonsPanel, Panel): col = split.column() col.prop(rl, "samples") col.prop(rl, "use_sky", "Use Environment") + +class CyclesRender_PT_layer_passes(CyclesButtonsPanel, Panel): + bl_label = "Passes" + bl_context = "render_layer" + bl_options = {'DEFAULT_CLOSED'} + + def draw(self, context): + layout = self.layout + + scene = context.scene + rd = scene.render + rl = rd.layers.active split = layout.split() col = split.column() - col.label(text="Passes:") col.prop(rl, "use_pass_combined") col.prop(rl, "use_pass_z") col.prop(rl, "use_pass_normal") |