archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

svn merge ^/trunk/blender -r46684:46699

Browse Source
This commit is contained in:
Campbell Barton
2012-05-16 16:41:51 +00:00
parent d82ca6d636 bd45c0008c
commit 09bb37fe93
41 changed files with 2551 additions and 1692 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
source/blender/editors/transform/transform_conversions.c
View File

@@ -4057,7 +4057,47 @@ static void freeSeqData(TransInfo *t)
}
}
#if 1 /* (mango hack! - for Ian) this is truely bad - should _never_ be in a release :| */
if (CTX_wm_window(t->context)->eventstate->alt) {
int minframe = MAXFRAME;
td= t->data;
seq_prev= NULL;
for (a=0; a<t->total; a++, td++) {
seq= ((TransDataSeq *)td->extra)->seq;
if ((seq != seq_prev)) {
minframe = MIN2(minframe, seq->startdisp);
}
}
for (seq= seqbasep->first; seq; seq= seq->next) {
if (!(seq->flag & SELECT)) {
if (seq->startdisp >= minframe) {
seq->machine += MAXSEQ * 2;
}
}
}
shuffle_seq_time(seqbasep, t->scene);
for (seq= seqbasep->first; seq; seq= seq->next) {
if (seq->machine >= MAXSEQ * 2) {
seq->machine -= MAXSEQ * 2;
seq->tmp= (void*)1;
}
else {
seq->tmp= NULL;
}
}
shuffle_seq_time(seqbasep, t->scene);
}
else {
shuffle_seq_time(seqbasep, t->scene);
}
#else
shuffle_seq_time(seqbasep, t->scene);
#endif
if (has_effect) {
/* update effects strips based on strips just moved in time */