diff options
| author | Joshua Leung <aligorith@gmail.com> | 2010-12-26 13:36:02 +0300 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2010-12-26 13:36:02 +0300 |
| commit | d0bdd8cd6461057033e5f80366193a7c10e98e7b (patch) | |
| tree | 8621af4d90e2f730aacb3481025254ffc93bff18 /source/blender/editors/space_nla | |
| parent | 858ae19e4ebe5d0e2788854e41a35b65e5505003 (diff) | |
Bugfix [#25380] Recorded bone keyframes do not play back both in the
action editor and the NLA editor
This commit fixes the situation where if a NLA Track was on 'solo'
mode and then deleted, NLA evaluation (including Active Action) would
stop working as a flag wasn't getting cleared.
Diffstat (limited to 'source/blender/editors/space_nla')
| -rw-r--r-- | source/blender/editors/space_nla/nla_channels.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/source/blender/editors/space_nla/nla_channels.c b/source/blender/editors/space_nla/nla_channels.c index 3cf1dcb5f68..92ca8f0decf 100644 --- a/source/blender/editors/space_nla/nla_channels.c +++ b/source/blender/editors/space_nla/nla_channels.c @@ -455,6 +455,12 @@ static int nlaedit_delete_tracks_exec (bContext *C, wmOperator *UNUSED(op)) NlaTrack *nlt= (NlaTrack *)ale->data; AnimData *adt= ale->adt; + /* if track is currently 'solo', then AnimData should have its + * 'has solo' flag disabled + */ + if (nlt->flag & NLATRACK_SOLO) + adt->flag &= ~ADT_NLA_SOLO_TRACK; + /* call delete on this track - deletes all strips too */ free_nlatrack(&adt->nla_tracks, nlt); } |