Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2012-01-17 20:06:24 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2012-01-17 20:06:24 +0400
commite5d4ecd180799d68ace8a9979e417ebdcc1d7ff0 (patch)
tree939fce4c2b3957b95e825d3c664bcd332d2f5377 /source/blender/editors/transform
parent7af10e9812a457f1388817c322ecb7ce30cc8444 (diff)
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.
Diffstat (limited to 'source/blender/editors/transform')
-rw-r--r--source/blender/editors/transform/transform_conversions.c23
1 files changed, 12 insertions, 11 deletions
diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c
index b060c04de4e..712941a6451 100644
--- a/source/blender/editors/transform/transform_conversions.c
+++ b/source/blender/editors/transform/transform_conversions.c
@@ -2300,6 +2300,18 @@ void flushTransSeq(TransInfo *t)
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 @@ void flushTransSeq(TransInfo *t)
}
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 ****************** */