Revision: 23841
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23841
Author: blendix
Date: 2009-10-14 17:14:06 +0200 (Wed, 14 Oct 2009)
Log Message:
-----------
Scene/Render Buttons:
* Keep Render as default tab instead of Scene.
* Remove unnecessary Keying Sets label.
* Fix missing scene name in render context path.
Modified Paths:
--------------
trunk/blender/release/scripts/ui/buttons_scene.py
trunk/blender/source/blender/editors/space_buttons/buttons_context.c
trunk/blender/source/blender/makesdna/DNA_space_types.h
Modified: trunk/blender/release/scripts/ui/buttons_scene.py
===================================================================
--- trunk/blender/release/scripts/ui/buttons_scene.py 2009-10-14 15:06:42 UTC
(rev 23840)
+++ trunk/blender/release/scripts/ui/buttons_scene.py 2009-10-14 15:14:06 UTC
(rev 23841)
@@ -47,10 +47,7 @@
scene = context.scene
row = layout.row()
- row.itemL(text="Keying Sets:")
- row = layout.row()
-
col = row.column()
col.template_list(scene, "keying_sets", scene,
"active_keying_set_index", rows=2)
Modified: trunk/blender/source/blender/editors/space_buttons/buttons_context.c
===================================================================
--- trunk/blender/source/blender/editors/space_buttons/buttons_context.c
2009-10-14 15:06:42 UTC (rev 23840)
+++ trunk/blender/source/blender/editors/space_buttons/buttons_context.c
2009-10-14 15:14:06 UTC (rev 23841)
@@ -777,7 +777,7 @@
name= RNA_struct_name_get_alloc(ptr, namebuf,
sizeof(namebuf));
if(name) {
- if(sbuts->mainb != BCONTEXT_SCENE && ptr->type
== &RNA_Scene)
+ if(!ELEM(sbuts->mainb, BCONTEXT_RENDER,
BCONTEXT_SCENE) && ptr->type == &RNA_Scene)
uiItemL(row, "", icon); /* save some
space */
else
uiItemL(row, name, icon);
Modified: trunk/blender/source/blender/makesdna/DNA_space_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_space_types.h 2009-10-14
15:06:42 UTC (rev 23840)
+++ trunk/blender/source/blender/makesdna/DNA_space_types.h 2009-10-14
15:14:06 UTC (rev 23841)
@@ -569,8 +569,8 @@
/* buts->mainb new */
-#define BCONTEXT_SCENE 0
-#define BCONTEXT_RENDER 1
+#define BCONTEXT_RENDER 0
+#define BCONTEXT_SCENE 1
#define BCONTEXT_WORLD 2
#define BCONTEXT_OBJECT 3
#define BCONTEXT_DATA 4
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
