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:
authorThomas Dinges <blender@dingto.org>2013-04-07 03:05:32 +0400
committerThomas Dinges <blender@dingto.org>2013-04-07 03:05:32 +0400
commit9c117ba54e6eb4ac8aa47dc8067fa0757925a2b6 (patch)
tree39fc8df6216d3abe160d5fc8a9346fa3081db1e5 /release/scripts/startup/bl_ui/properties_render_layer.py
parentce12370b79d670278bcfa0e135e0e4a8c343cd2b (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 'release/scripts/startup/bl_ui/properties_render_layer.py')
-rw-r--r--release/scripts/startup/bl_ui/properties_render_layer.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/release/scripts/startup/bl_ui/properties_render_layer.py b/release/scripts/startup/bl_ui/properties_render_layer.py
index af11fa505ff..c5c1f288186 100644
--- a/release/scripts/startup/bl_ui/properties_render_layer.py
+++ b/release/scripts/startup/bl_ui/properties_render_layer.py
@@ -52,7 +52,7 @@ class RENDERLAYER_UL_renderlayers(UIList):
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 @@ class RENDERLAYER_PT_layer_options(RenderLayerButtonsPanel, 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")
layout.separator()
layout.label(text="Include:")