diff options
author | Campbell Barton <ideasman42@gmail.com> | 2009-06-06 15:34:18 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2009-06-06 15:34:18 +0400 |
commit | acc88c9772795ffcbca352710626f83a870148a1 (patch) | |
tree | 26b37049f1a5b4bd87dd02316288cf2f4526b384 /source/blender/editors/space_buttons | |
parent | 880c43ad5a53203b64a6d6a51e239a4bfc6ed540 (diff) |
initial support for sequencer UI layout, anyone wants some monkey-work there are quite a few effects panels to do.
- buttons_context_path_sequencer() is a place holder
- ipo_frame_locked renamed to frame_locked
- added scene.sequence_editor.active_strip
Diffstat (limited to 'source/blender/editors/space_buttons')
-rw-r--r-- | source/blender/editors/space_buttons/buttons_context.c | 13 | ||||
-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, 19 insertions, 0 deletions
diff --git a/source/blender/editors/space_buttons/buttons_context.c b/source/blender/editors/space_buttons/buttons_context.c index 3e6fa9c6cff..029fc75f0ae 100644 --- a/source/blender/editors/space_buttons/buttons_context.c +++ b/source/blender/editors/space_buttons/buttons_context.c @@ -96,6 +96,16 @@ static int buttons_context_path_world(ButsContextPath *path) return 0; } +// XXX - place holder, need to get this working +static int buttons_context_path_sequencer(ButsContextPath *path) +{ + PointerRNA *ptr= &path->ptr[path->len-1]; + + /* this one just verifies */ + return RNA_struct_is_a(ptr->type, &RNA_Scene); +} + + static int buttons_context_path_object(ButsContextPath *path) { Scene *scene; @@ -302,6 +312,9 @@ static int buttons_context_path(const bContext *C, ButsContextPath *path) case BCONTEXT_WORLD: found= buttons_context_path_world(path); break; + case BCONTEXT_SEQUENCER: + found= buttons_context_path_sequencer(path); // XXX - place holder + break; case BCONTEXT_OBJECT: case BCONTEXT_PHYSICS: case BCONTEXT_MODIFIER: diff --git a/source/blender/editors/space_buttons/buttons_header.c b/source/blender/editors/space_buttons/buttons_header.c index 03b2ce9d11c..12ee528f8e0 100644 --- a/source/blender/editors/space_buttons/buttons_header.c +++ b/source/blender/editors/space_buttons/buttons_header.c @@ -182,6 +182,9 @@ void buttons_header_buttons(const bContext *C, ARegion *ar) if(!ob && !ELEM(sbuts->mainb, (float)BCONTEXT_SCENE, (float)BCONTEXT_WORLD)) sbuts->mainb = (float)BCONTEXT_WORLD; + + if(!ob && !ELEM(sbuts->mainb, (float)BCONTEXT_SCENE, (float)BCONTEXT_SEQUENCER)) + sbuts->mainb = (float)BCONTEXT_SEQUENCER; if((ob && ELEM5(ob->type, OB_EMPTY, OB_MBALL, OB_LAMP, OB_CAMERA, OB_ARMATURE)) && (sbuts->mainb == (float) BCONTEXT_MODIFIER)) sbuts->mainb = (float)BCONTEXT_DATA; @@ -190,6 +193,7 @@ void buttons_header_buttons(const bContext *C, ARegion *ar) uiBlockBeginAlign(block); uiDefIconButS(block, ROW, B_CONTEXT_SWITCH, ICON_SCENE, xco, yco, XIC, YIC, &(sbuts->mainb), 0.0, (float)BCONTEXT_SCENE, 0, 0, "Scene"); uiDefIconButS(block, ROW, B_CONTEXT_SWITCH, ICON_WORLD, xco+=XIC, yco, XIC, YIC, &(sbuts->mainb), 0.0, (float)BCONTEXT_WORLD, 0, 0, "World"); + uiDefIconButS(block, ROW, B_CONTEXT_SWITCH, ICON_SEQUENCE, xco+=XIC, yco, XIC, YIC, &(sbuts->mainb), 0.0, (float)BCONTEXT_SEQUENCER, 0, 0, "Sequencer"); // Specific panels, check on active object seletion if(ob) { diff --git a/source/blender/editors/space_buttons/space_buttons.c b/source/blender/editors/space_buttons/space_buttons.c index 57ca7cc23d8..35b398fbbb7 100644 --- a/source/blender/editors/space_buttons/space_buttons.c +++ b/source/blender/editors/space_buttons/space_buttons.c @@ -176,6 +176,8 @@ static void buttons_main_area_draw(const bContext *C, ARegion *ar) ED_region_panels(C, ar, vertical, "scene"); else if(sbuts->mainb == BCONTEXT_WORLD) ED_region_panels(C, ar, vertical, "world"); + else if(sbuts->mainb == BCONTEXT_SEQUENCER) + ED_region_panels(C, ar, vertical, "sequencer"); else if(sbuts->mainb == BCONTEXT_OBJECT) ED_region_panels(C, ar, vertical, "object"); else if(sbuts->mainb == BCONTEXT_DATA) |