Scene/Render Buttons:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>
Wed, 14 Oct 2009 15:14:06 +0000 (15:14 +0000)
committerBrecht Van Lommel <brechtvanlommel@pandora.be>
Wed, 14 Oct 2009 15:14:06 +0000 (15:14 +0000)
* Keep Render as default tab instead of Scene.
* Remove unnecessary Keying Sets label.
* Fix missing scene name in render context path.

release/scripts/ui/buttons_scene.py
source/blender/editors/space_buttons/buttons_context.c
source/blender/makesdna/DNA_space_types.h

index b3b3d8b6672ff2177fa6630af968abd7c287b047..deb20f2b4321bff30ed9eca1ec983f737cfb8b6d 100644 (file)
@@ -46,9 +46,6 @@ class SCENE_PT_keying_sets(SceneButtonsPanel):
                
                scene = context.scene
                
-               row = layout.row()
-               row.itemL(text="Keying Sets:")
-               
                row = layout.row()
                
                col = row.column()
index c6cde9f1c6b92a5eb569b58ca69cb1a3e49e6e2a..8072853bcb8d1d62ac5fcb01e8f444ff84339236 100644 (file)
@@ -777,7 +777,7 @@ void buttons_context_draw(const bContext *C, uiLayout *layout)
                        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);
index 0c2b89b7b29b85ac827534b9d1971c74290178a3..d7793b88beabd75b8f472382e7d40bd94de75066 100644 (file)
@@ -569,8 +569,8 @@ typedef struct SpaceUserPref {
 
 
 /* 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