[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28361] trunk/blender: corrections to last commit.

Campbell Barton ideasman42 at gmail.com
Thu Apr 22 22:24:19 CEST 2010


Revision: 28361
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28361
Author:   campbellbarton
Date:     2010-04-22 22:24:19 +0200 (Thu, 22 Apr 2010)

Log Message:
-----------
corrections to last commit.

Modified Paths:
--------------
    trunk/blender/release/scripts/ui/properties_render.py
    trunk/blender/source/blender/editors/space_view3d/view3d_header.c
    trunk/blender/source/blender/makesrna/intern/rna_space.c

Modified: trunk/blender/release/scripts/ui/properties_render.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_render.py	2010-04-22 20:00:19 UTC (rev 28360)
+++ trunk/blender/release/scripts/ui/properties_render.py	2010-04-22 20:24:19 UTC (rev 28361)
@@ -99,7 +99,7 @@
         col.prop(scene, "layers", text="Scene")
         if wide_ui:
             col = split.column()
-        col.prop(rl, "layers", text="Layer")
+        col.prop(rl, "visible_layers", text="Layer")
 
         layout.prop(rl, "light_override", text="Light")
         layout.prop(rl, "material_override", text="Material")

Modified: trunk/blender/source/blender/editors/space_view3d/view3d_header.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_header.c	2010-04-22 20:00:19 UTC (rev 28360)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_header.c	2010-04-22 20:24:19 UTC (rev 28361)
@@ -523,9 +523,9 @@
 		
 		/* Layers */
 		if (v3d->scenelock)
-			uiTemplateLayers(layout, &sceneptr, "visible_layers", &v3dptr, "used_layers", ob_lay);
+			uiTemplateLayers(layout, &sceneptr, "layers", &v3dptr, "used_layers", ob_lay);
 		else
-			uiTemplateLayers(layout, &v3dptr, "visible_layers", &v3dptr, "used_layers", ob_lay);
+			uiTemplateLayers(layout, &v3dptr, "layers", &v3dptr, "used_layers", ob_lay);
 
 		/* Scene lock */
 		uiItemR(layout, &v3dptr, "lock_camera_and_layers", UI_ITEM_R_ICON_ONLY, "", 0);

Modified: trunk/blender/source/blender/makesrna/intern/rna_space.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_space.c	2010-04-22 20:00:19 UTC (rev 28360)
+++ trunk/blender/source/blender/makesrna/intern/rna_space.c	2010-04-22 20:24:19 UTC (rev 28361)
@@ -1070,7 +1070,7 @@
 	RNA_def_property_ui_icon(prop, ICON_LOCKVIEW_OFF, 1);
 	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_VIEW3D, NULL);
 
-	prop= RNA_def_property(srna, "visible_layers", PROP_BOOLEAN, PROP_LAYER_MEMBER);
+	prop= RNA_def_property(srna, "layers", PROP_BOOLEAN, PROP_LAYER_MEMBER);
 	RNA_def_property_boolean_sdna(prop, NULL, "lay", 1);
 	RNA_def_property_array(prop, 20);
 	RNA_def_property_boolean_funcs(prop, NULL, "rna_Space3DView_layer_set");





More information about the Bf-blender-cvs mailing list