diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-10-14 19:14:06 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-10-14 19:14:06 +0400 |
| commit | 922461830fa801179ca213ef4c208d1d14274c81 (patch) | |
| tree | 86b992f3500efe522dc0248b81e82c045ace2c90 | |
| parent | bc0916c630a17a691768b1b55f7925b8f004ad12 (diff) | |
Scene/Render Buttons:
* Keep Render as default tab instead of Scene.
* Remove unnecessary Keying Sets label.
* Fix missing scene name in render context path.
| -rw-r--r-- | release/scripts/ui/buttons_scene.py | 3 | ||||
| -rw-r--r-- | source/blender/editors/space_buttons/buttons_context.c | 2 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_space_types.h | 4 |
3 files changed, 3 insertions, 6 deletions
diff --git a/release/scripts/ui/buttons_scene.py b/release/scripts/ui/buttons_scene.py index b3b3d8b6672..deb20f2b432 100644 --- a/release/scripts/ui/buttons_scene.py +++ b/release/scripts/ui/buttons_scene.py @@ -47,9 +47,6 @@ class SCENE_PT_keying_sets(SceneButtonsPanel): 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) diff --git a/source/blender/editors/space_buttons/buttons_context.c b/source/blender/editors/space_buttons/buttons_context.c index c6cde9f1c6b..8072853bcb8 100644 --- a/source/blender/editors/space_buttons/buttons_context.c +++ b/source/blender/editors/space_buttons/buttons_context.c @@ -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); diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h index 0c2b89b7b29..d7793b88bea 100644 --- a/source/blender/makesdna/DNA_space_types.h +++ b/source/blender/makesdna/DNA_space_types.h @@ -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 |