From d0bdd8cd6461057033e5f80366193a7c10e98e7b Mon Sep 17 00:00:00 2001 From: Joshua Leung Date: Sun, 26 Dec 2010 10:36:02 +0000 Subject: 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. --- source/blender/editors/space_nla/nla_channels.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'source/blender/editors/space_nla/nla_channels.c') 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); } -- cgit v1.2.3