[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40652] trunk/blender/source/blender/ editors/transform/transform_conversions.c: fix [#28158] Image crop keyframes/fcurves do not 'stick' to strip

[Campbell Barton]

Revision: 40652
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40652
Author:   campbellbarton
Date:     2011-09-28 10:05:56 +0000 (Wed, 28 Sep 2011)
Log Message:
-----------
fix [#28158] Image crop keyframes/fcurves do not 'stick' to strip

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	2011-09-28 09:47:30 UTC (rev 40651)
+++ trunk/blender/source/blender/editors/transform/transform_conversions.c	2011-09-28 10:05:56 UTC (rev 40652)
@@ -2193,6 +2193,12 @@
 }
 
 /* *** SEQUENCE EDITOR *** */
+
+/* commented _only_ because the meta may have animaion data which
+ * needs moving too [#28158] */
+
+#define SEQ_TX_NESTED_METAS
+
 void flushTransSeq(TransInfo *t)
 {
 	ListBase *seqbasep= seq_give_editing(t->scene, FALSE)->seqbasep; /* Editing null check already done */
@@ -2218,9 +2224,13 @@
 
 		switch (tdsq->sel_flag) {
 		case SELECT:
+#ifdef SEQ_TX_NESTED_METAS
+			if ((seq->depth != 0 || seq_tx_test(seq))) /* for meta's, their children move */
+				seq->start= new_frame - tdsq->start_offset;
+#else
 			if (seq->type != SEQ_META && (seq->depth != 0 || seq_tx_test(seq))) /* for meta's, their children move */
 				seq->start= new_frame - tdsq->start_offset;
-
+#endif
 			if (seq->depth==0) {
 				seq->machine= (int)floor(td2d->loc[1] + 0.5f);
 				CLAMP(seq->machine, 1, MAXSEQ);
@@ -3827,6 +3837,11 @@
 		else {
 			/* Nested, different rules apply */
 
+#ifdef SEQ_TX_NESTED_METAS
+			*flag= (seq->flag | SELECT) & ~(SEQ_LEFTSEL|SEQ_RIGHTSEL);
+			*count= 1; /* ignore the selection for nested */
+			*recursive = (seq->type == SEQ_META	);
+#else
 			if (seq->type == SEQ_META) {
 				/* Meta's can only directly be moved between channels since they
 				 * dont have their start and length set directly (children affect that)
@@ -3841,6 +3856,7 @@
 				*count= 1; /* ignore the selection for nested */
 				*recursive = 0;
 			}
+#endif
 		}
 	}
 }