[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32432] trunk/blender: bugfix [#23899] renderlayers are not working properly

[Campbell Barton]

Revision: 32432
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32432
Author:   campbellbarton
Date:     2010-10-13 00:20:10 +0200 (Wed, 13 Oct 2010)

Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/blender/release/scripts/ui/properties_data_mesh.py
    trunk/blender/release/scripts/ui/properties_render.py
    trunk/blender/source/blender/makesrna/intern/rna_object.c
    trunk/blender/source/blender/makesrna/intern/rna_scene.c

Modified: trunk/blender/release/scripts/ui/properties_data_mesh.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_data_mesh.py	2010-10-12 21:47:13 UTC (rev 32431)
+++ trunk/blender/release/scripts/ui/properties_data_mesh.py	2010-10-12 22:20:10 UTC (rev 32432)
@@ -182,7 +182,7 @@
         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 @@
             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="")
 

Modified: trunk/blender/release/scripts/ui/properties_render.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_render.py	2010-10-12 21:47:13 UTC (rev 32431)
+++ trunk/blender/release/scripts/ui/properties_render.py	2010-10-12 22:20:10 UTC (rev 32432)
@@ -84,10 +84,11 @@
         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()
 

Modified: trunk/blender/source/blender/makesrna/intern/rna_object.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_object.c	2010-10-12 21:47:13 UTC (rev 32431)
+++ trunk/blender/source/blender/makesrna/intern/rna_object.c	2010-10-12 22:20:10 UTC (rev 32432)
@@ -2152,7 +2152,7 @@
 	RNA_def_property_ui_text(prop, "Pose", "Current pose for armatures");
 
 	/* shape keys */
-	prop= RNA_def_property(srna, "show_shape_key", PROP_BOOLEAN, PROP_NONE);
+	prop= RNA_def_property(srna, "show_only_shape_key", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "shapeflag", OB_SHAPE_LOCK);
 	RNA_def_property_ui_text(prop, "Shape Key Lock", "Always show the current Shape for this Object");
 	RNA_def_property_ui_icon(prop, ICON_UNPINNED, 1);

Modified: trunk/blender/source/blender/makesrna/intern/rna_scene.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_scene.c	2010-10-12 21:47:13 UTC (rev 32431)
+++ trunk/blender/source/blender/makesrna/intern/rna_scene.c	2010-10-12 22:20:10 UTC (rev 32432)
@@ -2837,6 +2837,7 @@
 	prop= RNA_def_property(srna, "use_single_layer", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "scemode", R_SINGLE_LAYER);
 	RNA_def_property_ui_text(prop, "Single Layer", "Only render the active layer");
+	RNA_def_property_ui_icon(prop, ICON_UNPINNED, 1);
 	RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL);
 
 	/* engine */