[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11982] trunk/blender/source/blender/ blenkernel/intern/action.c: Bugfix #6923:

[Joshua Leung]

Revision: 11982
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11982
Author:   aligorith
Date:     2007-09-09 13:54:12 +0200 (Sun, 09 Sep 2007)

Log Message:
-----------
Bugfix #6923: 

NLA was calculating extensions of strips in the wrong order. This was not an issue in many cases, although it is highlighted in the following case:

[strip 1 - 'hold' is on] ----------------------------
                               [strip 2        ]

Logically, the end of strip 1 would hold on until the start of strip 2. However, the start of strip 2 was extended to the end of strip 1 instead.

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

Modified: trunk/blender/source/blender/blenkernel/intern/action.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/action.c	2007-09-09 11:05:21 UTC (rev 11981)
+++ trunk/blender/source/blender/blenkernel/intern/action.c	2007-09-09 11:54:12 UTC (rev 11982)
@@ -1071,10 +1071,10 @@
 		}
 	}
 	if(strip==NULL) {	/* extend */
-		if(stripfirst)
+		if(striplast)
+			scene_cfra= striplast->end;
+		else if(stripfirst)
 			scene_cfra= stripfirst->start;
-		else if(striplast)
-			scene_cfra= striplast->end;
 	}
 	
 	/* and now go over all strips */