diff options
| author | William Reynish <william@reynish.com> | 2009-10-14 18:07:32 +0400 |
|---|---|---|
| committer | William Reynish <william@reynish.com> | 2009-10-14 18:07:32 +0400 |
| commit | 1847f6198e50118e8e6541dfcb351dda40802511 (patch) | |
| tree | ff0e27eafbdf7ad27feb19f3e25b0f588c1ea44b /source/blender/editors/space_buttons | |
| parent | 1ce959b16e936a4e35808c04a95e1b143f46947d (diff) | |
After discussion with Campbell, split Scene tab in Scene and Render. This makes a clearer distinction between render and scene settings.
Diffstat (limited to 'source/blender/editors/space_buttons')
| -rw-r--r-- | source/blender/editors/space_buttons/buttons_context.c | 1 | ||||
| -rw-r--r-- | source/blender/editors/space_buttons/buttons_header.c | 4 | ||||
| -rw-r--r-- | source/blender/editors/space_buttons/space_buttons.c | 2 |
3 files changed, 6 insertions, 1 deletions
diff --git a/source/blender/editors/space_buttons/buttons_context.c b/source/blender/editors/space_buttons/buttons_context.c index fe437dfd188..c6cde9f1c6b 100644 --- a/source/blender/editors/space_buttons/buttons_context.c +++ b/source/blender/editors/space_buttons/buttons_context.c @@ -437,6 +437,7 @@ static int buttons_context_path(const bContext *C, ButsContextPath *path, int ma * tracing back recursively */ switch(mainb) { case BCONTEXT_SCENE: + case BCONTEXT_RENDER: found= buttons_context_path_scene(path); break; case BCONTEXT_WORLD: diff --git a/source/blender/editors/space_buttons/buttons_header.c b/source/blender/editors/space_buttons/buttons_header.c index 83dd679c543..1bf2a058b5a 100644 --- a/source/blender/editors/space_buttons/buttons_header.c +++ b/source/blender/editors/space_buttons/buttons_header.c @@ -107,8 +107,10 @@ void buttons_header_buttons(const bContext *C, ARegion *ar) // Default panels uiBlockBeginAlign(block); + if(sbuts->pathflag & (1<<BCONTEXT_RENDER)) + uiDefIconButS(block, ROW, B_CONTEXT_SWITCH, ICON_SCENE, xco+=BUTS_UI_UNIT, yco, BUTS_UI_UNIT, BUTS_UI_UNIT, &(sbuts->mainb), 0.0, (float)BCONTEXT_RENDER, 0, 0, "Render"); if(sbuts->pathflag & (1<<BCONTEXT_SCENE)) - uiDefIconButS(block, ROW, B_CONTEXT_SWITCH, ICON_SCENE, xco+=BUTS_UI_UNIT, yco, BUTS_UI_UNIT, BUTS_UI_UNIT, &(sbuts->mainb), 0.0, (float)BCONTEXT_SCENE, 0, 0, "Scene"); + uiDefIconButS(block, ROW, B_CONTEXT_SWITCH, ICON_SCENE_DATA, xco+=BUTS_UI_UNIT, yco, BUTS_UI_UNIT, BUTS_UI_UNIT, &(sbuts->mainb), 0.0, (float)BCONTEXT_SCENE, 0, 0, "Scene"); if(sbuts->pathflag & (1<<BCONTEXT_WORLD)) uiDefIconButS(block, ROW, B_CONTEXT_SWITCH, ICON_WORLD, xco+=BUTS_UI_UNIT, yco, BUTS_UI_UNIT, BUTS_UI_UNIT, &(sbuts->mainb), 0.0, (float)BCONTEXT_WORLD, 0, 0, "World"); if(sbuts->pathflag & (1<<BCONTEXT_OBJECT)) diff --git a/source/blender/editors/space_buttons/space_buttons.c b/source/blender/editors/space_buttons/space_buttons.c index 03d126a3e7b..c1f06d99985 100644 --- a/source/blender/editors/space_buttons/space_buttons.c +++ b/source/blender/editors/space_buttons/space_buttons.c @@ -156,6 +156,8 @@ static void buttons_main_area_draw(const bContext *C, ARegion *ar) if(sbuts->mainb == BCONTEXT_SCENE) ED_region_panels(C, ar, vertical, "scene", sbuts->mainb); + else if(sbuts->mainb == BCONTEXT_RENDER) + ED_region_panels(C, ar, vertical, "render", sbuts->mainb); else if(sbuts->mainb == BCONTEXT_WORLD) ED_region_panels(C, ar, vertical, "world", sbuts->mainb); else if(sbuts->mainb == BCONTEXT_OBJECT) |