[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46308] trunk/blender/source/blender/ blenkernel/intern/anim_sys.c: Mango Bugfix - Actions being tweaked in NLA Editor were not being played back if

[Joshua Leung]

Revision: 46308
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46308
Author:   aligorith
Date:     2012-05-05 05:23:28 +0000 (Sat, 05 May 2012)
Log Message:
-----------
Mango Bugfix - Actions being tweaked in NLA Editor were not being played back if
the track that they belonged to was currently being played back "solo"

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/anim_sys.c

Modified: trunk/blender/source/blender/blenkernel/intern/anim_sys.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/anim_sys.c	2012-05-05 00:58:22 UTC (rev 46307)
+++ trunk/blender/source/blender/blenkernel/intern/anim_sys.c	2012-05-05 05:23:28 UTC (rev 46308)
@@ -2035,8 +2035,10 @@
 	
 	/* add 'active' Action (may be tweaking track) as last strip to evaluate in NLA stack
 	 *	- only do this if we're not exclusively evaluating the 'solo' NLA-track
+	 *	- however, if the 'solo' track houses the current 'tweaking' strip, 
+	 *	  then we should allow this to play, otherwise nothing happens
 	 */
-	if ((adt->action) && !(adt->flag & ADT_NLA_SOLO_TRACK)) {
+	if ((adt->action) && ((adt->flag & ADT_NLA_SOLO_TRACK)==0 || (adt->flag & ADT_NLA_EDIT_ON))) {
 		/* if there are strips, evaluate action as per NLA rules */
 		if ((has_strips) || (adt->actstrip)) {
 			/* make dummy NLA strip, and add that to the stack */