Revision: 24055
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24055
Author: campbellbarton
Date: 2009-10-22 17:06:01 +0200 (Thu, 22 Oct 2009)
Log Message:
-----------
fix for last commit, metastrips work now
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/sequence.c
trunk/blender/source/blender/editors/transform/transform_conversions.c
Modified: trunk/blender/source/blender/blenkernel/intern/sequence.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/sequence.c 2009-10-22
14:40:32 UTC (rev 24054)
+++ trunk/blender/source/blender/blenkernel/intern/sequence.c 2009-10-22
15:06:01 UTC (rev 24055)
@@ -3466,7 +3466,6 @@
int shuffle_seq_time(ListBase * seqbasep)
{
- /* note: metastrinps untested */
/* note: seq->tmp is used to tag strips to move */
Sequence *seq;
@@ -3478,12 +3477,13 @@
if(offset) {
for(seq= seqbasep->first; seq; seq= seq->next) {
if(seq->tmp) {
- seq->start += offset;
+ seq_translate(seq, offset);
seq->flag &= ~SEQ_OVERLAP;
- calc_sequence(seq);
}
}
}
+
+ return offset? 0:1;
}
Modified: trunk/blender/source/blender/editors/transform/transform_conversions.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_conversions.c
2009-10-22 14:40:32 UTC (rev 24054)
+++ trunk/blender/source/blender/editors/transform/transform_conversions.c
2009-10-22 15:06:01 UTC (rev 24055)
@@ -4074,6 +4074,7 @@
int overlap= 0;
for(a=0; a<t->total; a++, td++) {
+ seq_prev= NULL;
seq= ((TransDataSeq *)td->extra)->seq;
if ((seq != seq_prev) &&
(seq->depth==0) && (seq->flag & SEQ_OVERLAP)) {
overlap= 1;
@@ -4087,7 +4088,7 @@
seq->tmp= NULL;
td= t->data;
-
+ seq_prev= NULL;
for(a=0; a<t->total; a++, td++) {
seq= ((TransDataSeq
*)td->extra)->seq;
if ((seq != seq_prev)) {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
