Bugfix [#25380] Recorded bone keyframes do not play back both in the
authorJoshua Leung <aligorith@gmail.com>
Sun, 26 Dec 2010 10:36:02 +0000 (10:36 +0000)
committerJoshua Leung <aligorith@gmail.com>
Sun, 26 Dec 2010 10:36:02 +0000 (10:36 +0000)
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

index 3cf1dcb5f68b1532ce4bdc4266789fccdb5b8997..92ca8f0decfb8ee53fec85e0f0514851505f4aa2 100644 (file)
@@ -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);
                }