[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33001] trunk/blender/source/blender/ blenkernel/intern/nla.c: NLA Transform Bugfix:

[Joshua Leung]

Revision: 33001
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33001
Author:   aligorith
Date:     2010-11-11 11:07:33 +0100 (Thu, 11 Nov 2010)

Log Message:
-----------
NLA Transform Bugfix:

Transforming strips into locked tracks meant that they were not unlocked properly (i.e. they stayed as temporary "meta" strips). This is now taken into account as part of the step which checks if there's any space for them in those tracks.

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

Modified: trunk/blender/source/blender/blenkernel/intern/nla.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/nla.c	2010-11-11 10:01:10 UTC (rev 33000)
+++ trunk/blender/source/blender/blenkernel/intern/nla.c	2010-11-11 10:07:33 UTC (rev 33001)
@@ -916,9 +916,14 @@
 /* Check if there is any space in the given track to add a strip of the given length */
 short BKE_nlatrack_has_space (NlaTrack *nlt, float start, float end)
 {
-	/* sanity checks */
-	if ((nlt == NULL) || IS_EQ(start, end))
+	/* sanity checks 
+	 * 	- track must exist
+	 * 	- track must be editable
+	 * 	- bounds cannot be equal (0-length is nasty) 
+	 */
+	if ((nlt == NULL) || (nlt->flag & NLATRACK_PROTECTED) || IS_EQ(start, end))
 		return 0;
+	
 	if (start > end) {
 		puts("BKE_nlatrack_has_space() error... start and end arguments swapped");
 		SWAP(float, start, end);