Revision: 33891
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33891
Author: aligorith
Date: 2010-12-26 11:36:02 +0100 (Sun, 26 Dec 2010)
Log Message:
-----------
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.
Modified Paths:
--------------
trunk/blender/source/blender/editors/space_nla/nla_channels.c
Modified: trunk/blender/source/blender/editors/space_nla/nla_channels.c
===================================================================
--- trunk/blender/source/blender/editors/space_nla/nla_channels.c
2010-12-26 10:34:09 UTC (rev 33890)
+++ trunk/blender/source/blender/editors/space_nla/nla_channels.c
2010-12-26 10:36:02 UTC (rev 33891)
@@ -455,6 +455,12 @@
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);
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
