[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43457] trunk/blender/source/blender/ editors/transform/transform_conversions.c: Fix #29905: extend transform a sequencer meta strip did not update the position

[Brecht Van Lommel]

Revision: 43457
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43457
Author:   blendix
Date:     2012-01-17 16:06:24 +0000 (Tue, 17 Jan 2012)
Log Message:
-----------
Fix #29905: extend transform a sequencer meta strip did not update the position
and length of the meta strip properly, only its contents. Also overlap check was
done too soon giving false positives, should be after meta strip update.

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	2012-01-17 16:06:16 UTC (rev 43456)
+++ trunk/blender/source/blender/editors/transform/transform_conversions.c	2012-01-17 16:06:24 UTC (rev 43457)
@@ -2300,6 +2300,18 @@
 		seq_prev= seq;
 	}
 
+
+	if (ELEM(t->mode, TFM_SEQ_SLIDE, TFM_TIME_TRANSLATE)) { /* originally TFM_TIME_EXTEND, transform changes */
+		/* Special annoying case here, need to calc metas with TFM_TIME_EXTEND only */
+		seq= seqbasep->first;
+
+		while(seq) {
+			if (seq->type == SEQ_META && seq->flag & SELECT)
+				calc_sequence(t->scene, seq);
+			seq= seq->next;
+		}
+	}
+
 	/* need to do the overlap check in a new loop otherwise adjacent strips
 	 * will not be updated and we'll get false positives */
 	seq_prev= NULL;
@@ -2319,17 +2331,6 @@
 		}
 		seq_prev= seq;
 	}
-
-	if (t->mode == TFM_SEQ_SLIDE) { /* originally TFM_TIME_EXTEND, transform changes */
-		/* Special annoying case here, need to calc metas with TFM_TIME_EXTEND only */
-		seq= seqbasep->first;
-
-		while(seq) {
-			if (seq->type == SEQ_META && seq->flag & SELECT)
-				calc_sequence(t->scene, seq);
-			seq= seq->next;
-		}
-	}
 }
 
 /* ********************* UV ****************** */