diff options
| author | Joshua Leung <aligorith@gmail.com> | 2009-07-12 08:29:36 +0400 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2009-07-12 08:29:36 +0400 |
| commit | fa8bd34d95d91712ffa6dc9066c255e9ee40e7e4 (patch) | |
| tree | cbc357062cdb8748ac1bd6943724301439e3745e /source/blender/editors/space_nla | |
| parent | bb158ad5721b98086b77a8168a53c4901540907d (diff) | |
NLA Bugfixes:
* Fixed crash when anim-playback is running and a strip beside a transition gets transformed.
Transition strips no-longer assume that their neighbours are action-clips, using the standard NLA-strip evaluation function instead to evaluate their neighbours. However, a check for ping-pong recursion needed to be added there, so that a transition beside a meta-strip, with the meta having a transition nested at the start of one of its levels, wouldn't fail with stack overflow.
* Moved 'Tweak Mode' menu entry to Edit menu, since it's not really that modal.
Diffstat (limited to 'source/blender/editors/space_nla')
| -rw-r--r-- | source/blender/editors/space_nla/nla_header.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/source/blender/editors/space_nla/nla_header.c b/source/blender/editors/space_nla/nla_header.c index 8e4c71b9f80..e997a096bce 100644 --- a/source/blender/editors/space_nla/nla_header.c +++ b/source/blender/editors/space_nla/nla_header.c @@ -83,7 +83,6 @@ static void nla_viewmenu(bContext *C, uiLayout *layout, void *arg_unused) { bScreen *sc= CTX_wm_screen(C); ScrArea *sa= CTX_wm_area(C); - Scene *scene= CTX_data_scene(C); SpaceNla *snla= (SpaceNla*)CTX_wm_space_data(C); PointerRNA spaceptr; @@ -104,11 +103,6 @@ static void nla_viewmenu(bContext *C, uiLayout *layout, void *arg_unused) uiItemS(layout); - if (scene->flag & SCE_NLA_EDIT_ON) - uiItemO(layout, NULL, 0, "NLA_OT_tweakmode_exit"); - else - uiItemO(layout, NULL, 0, "NLA_OT_tweakmode_enter"); - uiItemS(layout); uiItemO(layout, NULL, 0, "ANIM_OT_previewrange_set"); @@ -153,6 +147,8 @@ static void nla_edit_snapmenu(bContext *C, uiLayout *layout, void *arg_unused) static void nla_editmenu(bContext *C, uiLayout *layout, void *arg_unused) { + Scene *scene= CTX_data_scene(C); + uiItemMenuF(layout, "Transform", 0, nla_edit_transformmenu); uiItemMenuF(layout, "Snap", 0, nla_edit_snapmenu); @@ -160,9 +156,6 @@ static void nla_editmenu(bContext *C, uiLayout *layout, void *arg_unused) uiItemO(layout, NULL, 0, "NLA_OT_duplicate"); uiItemO(layout, NULL, 0, "NLA_OT_split"); - - uiItemS(layout); - uiItemO(layout, NULL, 0, "NLA_OT_delete"); uiItemS(layout); @@ -178,6 +171,14 @@ static void nla_editmenu(bContext *C, uiLayout *layout, void *arg_unused) uiItemO(layout, NULL, 0, "NLA_OT_move_up"); uiItemO(layout, NULL, 0, "NLA_OT_move_down"); + + uiItemS(layout); + + // TODO: names of these tools for 'tweakmode' need changing? + if (scene->flag & SCE_NLA_EDIT_ON) + uiItemO(layout, "Stop Tweaking Strip Actions", 0, "NLA_OT_tweakmode_exit"); + else + uiItemO(layout, "Start Tweaking Strip Actions", 0, "NLA_OT_tweakmode_enter"); } static void nla_addmenu(bContext *C, uiLayout *layout, void *arg_unused) |