Commit: 112300a982380c0b87cc1836d83143c902afad14
Author: Campbell Barton
Date: Mon Mar 21 19:22:39 2016 +1100
Branches: master
https://developer.blender.org/rB112300a982380c0b87cc1836d83143c902afad14
Fix T47862: VSE hard cut fails
Regression caused by changing how video length is calculated,
however similar problems could be caused by strip length changing on-disk.
===================================================================
M source/blender/editors/space_sequencer/sequencer_edit.c
===================================================================
diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c
b/source/blender/editors/space_sequencer/sequencer_edit.c
index c0a95225f..df3e508 100644
--- a/source/blender/editors/space_sequencer/sequencer_edit.c
+++ b/source/blender/editors/space_sequencer/sequencer_edit.c
@@ -685,6 +685,14 @@ static Sequence *cut_seq_hard(Scene *scene, Sequence *seq,
int cutframe)
/* First Strip! */
/* strips with extended stillfames before */
+ /* Precaution, needed because the length saved on-disk may not match
the length saved in the blend file,
+ * or our code may have minor differences reading file length between
versions.
+ * This causes hard-cut to fail, see: T47862 */
+ if (seq->type != SEQ_TYPE_META) {
+ BKE_sequence_reload_new_file(scene, seq, true);
+ BKE_sequence_calc(scene, seq);
+ }
+
if ((seq->startstill) && (cutframe < seq->start)) {
/* don't do funny things with METAs ... */
if (seq->type == SEQ_TYPE_META) {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
