diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-10-13 02:20:10 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-10-13 02:20:10 +0400 |
| commit | 5790deb4df1d492f6018d5082280cb0246e3d833 (patch) | |
| tree | d91e531099b691dd4e5339c1ef71414060e4301f /release | |
| parent | b64098a85af30a1d5f74fbb876e939905a2cc44f (diff) | |
bugfix [#23899] renderlayers are not working properly
was missing button for single layer rendering.
also renamed Object.show_shape_key to Object.show_only_shape_key since this pin's the shape key so others are disabled.
Diffstat (limited to 'release')
| -rw-r--r-- | release/scripts/ui/properties_data_mesh.py | 4 | ||||
| -rw-r--r-- | release/scripts/ui/properties_render.py | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/release/scripts/ui/properties_data_mesh.py b/release/scripts/ui/properties_data_mesh.py index 38364139147..ebe34d1fe11 100644 --- a/release/scripts/ui/properties_data_mesh.py +++ b/release/scripts/ui/properties_data_mesh.py @@ -182,7 +182,7 @@ class DATA_PT_shape_keys(MeshButtonsPanel, bpy.types.Panel): enable_edit = ob.mode != 'EDIT' enable_edit_value = False - if ob.show_shape_key is False: + if ob.show_only_shape_key is False: if enable_edit or (ob.type == 'MESH' and ob.use_shape_key_edit_mode): enable_edit_value = True @@ -218,7 +218,7 @@ class DATA_PT_shape_keys(MeshButtonsPanel, bpy.types.Panel): sub = row.row(align=True) subsub = sub.row(align=True) subsub.active = enable_edit_value - subsub.prop(ob, "show_shape_key", text="") + subsub.prop(ob, "show_only_shape_key", text="") subsub.prop(kb, "mute", text="") sub.prop(ob, "use_shape_key_edit_mode", text="") diff --git a/release/scripts/ui/properties_render.py b/release/scripts/ui/properties_render.py index dba9ff44d51..44f1223aa93 100644 --- a/release/scripts/ui/properties_render.py +++ b/release/scripts/ui/properties_render.py @@ -84,10 +84,11 @@ class RENDER_PT_layers(RenderButtonsPanel, bpy.types.Panel): 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 - if rl: - layout.prop(rl, "name") + row.prop(rl, "name") + row.prop(rd, "use_single_layer", text="", icon_only=True) split = layout.split() |