diff options
| author | Joshua Leung <aligorith@gmail.com> | 2012-05-05 09:23:28 +0400 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2012-05-05 09:23:28 +0400 |
| commit | 3b4c9f50415ac87b8c5a1d8e4503b056ed17314e (patch) | |
| tree | 2cedf37b73c42f7728ca2609b17b6a37d4f5c689 /source/blender/blenkernel | |
| parent | 084fedd03a006982b386873a70f649627bf200aa (diff) | |
Mango Bugfix - Actions being tweaked in NLA Editor were not being played back if
the track that they belonged to was currently being played back "solo"
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/intern/anim_sys.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/anim_sys.c b/source/blender/blenkernel/intern/anim_sys.c index f3a7ff90373..78584333367 100644 --- a/source/blender/blenkernel/intern/anim_sys.c +++ b/source/blender/blenkernel/intern/anim_sys.c @@ -2035,8 +2035,10 @@ static void animsys_evaluate_nla (ListBase *echannels, PointerRNA *ptr, AnimData /* add 'active' Action (may be tweaking track) as last strip to evaluate in NLA stack * - only do this if we're not exclusively evaluating the 'solo' NLA-track + * - however, if the 'solo' track houses the current 'tweaking' strip, + * then we should allow this to play, otherwise nothing happens */ - if ((adt->action) && !(adt->flag & ADT_NLA_SOLO_TRACK)) { + if ((adt->action) && ((adt->flag & ADT_NLA_SOLO_TRACK)==0 || (adt->flag & ADT_NLA_EDIT_ON))) { /* if there are strips, evaluate action as per NLA rules */ if ((has_strips) || (adt->actstrip)) { /* make dummy NLA strip, and add that to the stack */ |