[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55858] trunk/blender: Properties Editor / Render Layers:
Thomas Dinges
blender at dingto.org
Sun Apr 7 01:05:34 CEST 2013
Revision: 55858
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55858
Author: dingto
Date: 2013-04-06 23:05:32 +0000 (Sat, 06 Apr 2013)
Log Message:
-----------
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.
Modified Paths:
--------------
trunk/blender/intern/cycles/blender/addon/ui.py
trunk/blender/release/scripts/startup/bl_ui/properties_render_layer.py
Modified: trunk/blender/intern/cycles/blender/addon/ui.py
===================================================================
--- trunk/blender/intern/cycles/blender/addon/ui.py 2013-04-06 22:29:47 UTC (rev 55857)
+++ trunk/blender/intern/cycles/blender/addon/ui.py 2013-04-06 23:05:32 UTC (rev 55858)
@@ -244,28 +244,40 @@
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 @@
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 @@
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")
Modified: trunk/blender/release/scripts/startup/bl_ui/properties_render_layer.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_render_layer.py 2013-04-06 22:29:47 UTC (rev 55857)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_render_layer.py 2013-04-06 23:05:32 UTC (rev 55858)
@@ -52,7 +52,7 @@
class RENDERLAYER_PT_layers(RenderLayerButtonsPanel, Panel):
- bl_label = "Layers"
+ bl_label = "Layer List"
bl_options = {'HIDE_HEADER'}
COMPAT_ENGINES = {'BLENDER_RENDER'}
@@ -98,8 +98,7 @@
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")
layout.separator()
layout.label(text="Include:")
More information about the Bf-blender-cvs
mailing list