[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38122] trunk/blender/source/blender/ editors/space_sequencer/sequencer_edit.c: Fix #27848: sequencer strip hard cut looses soft trim on second strip.
Brecht Van Lommel
brechtvanlommel at pandora.be
Tue Jul 5 18:31:21 CEST 2011
Revision: 38122
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38122
Author: blendix
Date: 2011-07-05 16:31:21 +0000 (Tue, 05 Jul 2011)
Log Message:
-----------
Fix #27848: sequencer strip hard cut looses soft trim on second strip.
Modified Paths:
--------------
trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c
Modified: trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c 2011-07-05 14:53:37 UTC (rev 38121)
+++ trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c 2011-07-05 16:31:21 UTC (rev 38122)
@@ -124,6 +124,7 @@
int startstill, endstill;
int startdisp, enddisp;
int startofs, endofs;
+ int anim_startofs, anim_endofs;
/* int final_left, final_right; */ /* UNUSED */
int len;
} TransSeq;
@@ -729,8 +730,10 @@
ts.endstill= seq->endstill;
ts.startdisp= seq->startdisp;
ts.enddisp= seq->enddisp;
- ts.startofs= seq->anim_startofs;
- ts.endofs= seq->anim_endofs;
+ ts.startofs= seq->startofs;
+ ts.endofs= seq->endofs;
+ ts.anim_startofs= seq->anim_startofs;
+ ts.anim_endofs= seq->anim_endofs;
ts.len= seq->len;
/* First Strip! */
@@ -780,7 +783,7 @@
if ((seqn->startstill) && (cutframe == seqn->start + 1)) {
seqn->start = ts.start;
seqn->startstill= ts.start- cutframe;
- seqn->anim_endofs = ts.endofs;
+ seqn->anim_endofs = ts.anim_endofs;
seqn->endstill = ts.endstill;
}
@@ -789,8 +792,9 @@
seqn->start = cutframe;
seqn->startstill = 0;
seqn->startofs = 0;
+ seqn->endofs = ts.endofs;
seqn->anim_startofs += cutframe - ts.start;
- seqn->anim_endofs = ts.endofs;
+ seqn->anim_endofs = ts.anim_endofs;
seqn->endstill = ts.endstill;
}
@@ -825,6 +829,8 @@
ts.enddisp= seq->enddisp;
ts.startofs= seq->startofs;
ts.endofs= seq->endofs;
+ ts.anim_startofs= seq->anim_startofs;
+ ts.anim_endofs= seq->anim_endofs;
ts.len= seq->len;
/* First Strip! */
More information about the Bf-blender-cvs
mailing list