diff options
| author | Joshua Leung <aligorith@gmail.com> | 2015-04-14 08:10:04 +0300 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2015-04-14 09:39:07 +0300 |
| commit | bb1bc7ecda28cc3c70992f8383151e4055a227e0 (patch) | |
| tree | ffc7f7b729a997037994fcf234d0b898098ef72c /source/blender/editors/animation/anim_filter.c | |
| parent | c95f38b92aa2981a771c4a4c010270547becec26 (diff) | |
NLA: Store track that the strip being tweaked comes from
There should be no functional changes visible from this change, but this commit
should make it easier to code tools which need to check on tweeakmode status,
by making it easier to figure out which NLA Track contains the strip which
owned the action being edited. (The strip is already saved, so this commit just
adds the track alongside it).
For now there is no version patch for this. The worst that happens is that an
extra refresh is needed in the NLA editor to get these to show up.
Diffstat (limited to 'source/blender/editors/animation/anim_filter.c')
| -rw-r--r-- | source/blender/editors/animation/anim_filter.c | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/source/blender/editors/animation/anim_filter.c b/source/blender/editors/animation/anim_filter.c index 25f2b0b43af..f575326083a 100644 --- a/source/blender/editors/animation/anim_filter.c +++ b/source/blender/editors/animation/anim_filter.c @@ -1301,22 +1301,8 @@ static size_t animfilter_nla(bAnimContext *UNUSED(ac), ListBase *anim_data, bDop * - active track should still get shown though (even though it has disabled flag set) */ // FIXME: the channels after should still get drawn, just 'differently', and after an active-action channel - if ((adt->flag & ADT_NLA_EDIT_ON) && (nlt->flag & NLATRACK_DISABLED)) { - /* NOTE: The tweaking track may not be active, if strips from different AnimData blocks - * entered tweakmode at the same time. Since this loop works both ways, we can't - * just stop on the first disabled track we encounter... - */ - if (nlt->flag & NLATRACK_ACTIVE) { - /* OK = "the" active track */ - } - else if (BLI_findindex(&nlt->strips, adt->actstrip) != -1) { - /* OK = this is the one containing the active strip */ - } - else { - /* Not OK - neither of the previous two were met, so it must be one of the "later" ones */ - continue; - } - } + if ((adt->flag & ADT_NLA_EDIT_ON) && (nlt->flag & NLATRACK_DISABLED) && (adt->act_track != nlt)) + continue; /* only work with this channel and its subchannels if it is editable */ if (!(filter_mode & ANIMFILTER_FOREDIT) || EDITABLE_NLT(nlt)) { |