[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54261] trunk/blender/source/blender/ editors/transform/transform_conversions.c: Bugfix: "Extend" transform tool would leave dangling "temp meta strips" if none

[Joshua Leung]

Revision: 54261
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54261
Author:   aligorith
Date:     2013-02-02 05:38:57 +0000 (Sat, 02 Feb 2013)
Log Message:
-----------
Bugfix: "Extend" transform tool would leave dangling "temp meta strips" if none
of those strips occurred on the same side of CFRA indicator as the mouse

Modified Paths:
--------------
    trunk/blender/source/blender/editors/transform/transform_conversions.c

Modified: trunk/blender/source/blender/editors/transform/transform_conversions.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_conversions.c	2013-02-02 04:58:03 UTC (rev 54260)
+++ trunk/blender/source/blender/editors/transform/transform_conversions.c	2013-02-02 05:38:57 UTC (rev 54261)
@@ -2642,6 +2642,14 @@
 	
 	/* stop if trying to build list if nothing selected */
 	if (count == 0) {
+		/* clear temp metas that may have been created but aren't needed now 
+		 * because they fell on the wrong side of CFRA
+		 */
+		for (ale = anim_data.first; ale; ale = ale->next) {
+			NlaTrack *nlt = (NlaTrack *)ale->data;
+			BKE_nlastrips_clear_metas(&nlt->strips, 0, 1);
+		}
+		
 		/* cleanup temp list */
 		BLI_freelistN(&anim_data);
 		return;
@@ -2686,14 +2694,14 @@
 						tdn->oldTrack = tdn->nlt = nlt;
 						tdn->strip = strip;
 						tdn->trackIndex = BLI_findindex(&adt->nla_tracks, nlt);
-
+						
 						yval = (float)(tdn->trackIndex * NLACHANNEL_STEP(snla));
-
+						
 						tdn->h1[0] = strip->start;
 						tdn->h1[1] = yval;
 						tdn->h2[0] = strip->end;
 						tdn->h2[1] = yval;
-
+						
 						center[0] = (float)CFRA;
 						center[1] = yval;
 						center[2] = 0.0f;