[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32957] trunk/blender/source/blender/ editors/space_sequencer/sequencer_edit.c: bugfix [#24623] VSE strip animation data out of sync after moving using shift-s
Campbell Barton
ideasman42 at gmail.com
Tue Nov 9 05:56:54 CET 2010
Revision: 32957
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32957
Author: campbellbarton
Date: 2010-11-09 05:56:52 +0100 (Tue, 09 Nov 2010)
Log Message:
-----------
bugfix [#24623] VSE strip animation data out of sync after moving using shift-s
also fixes snap on metastrips which was snapping nested strips.
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 2010-11-09 03:52:27 UTC (rev 32956)
+++ trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c 2010-11-09 04:56:52 UTC (rev 32957)
@@ -1138,14 +1138,15 @@
snap_frame= RNA_int_get(op->ptr, "frame");
- /* problem: contents of meta's are all shifted to the same position... */
-
/* also check metas */
- SEQP_BEGIN(ed, seq) {
+ for(seq= ed->seqbasep->first; seq; seq= seq->next) {
if (seq->flag & SELECT && !(seq->depth==0 && seq->flag & SEQ_LOCK) &&
seq_tx_test(seq)) {
if((seq->flag & (SEQ_LEFTSEL+SEQ_RIGHTSEL))==0) {
- seq->start= snap_frame-seq->startofs+seq->startstill;
+ /* simple but no anim update */
+ /* seq->start= snap_frame-seq->startofs+seq->startstill; */
+
+ seq_translate(scene, seq, (snap_frame-seq->startofs+seq->startstill) - seq->start);
} else {
if(seq->flag & SEQ_LEFTSEL) {
seq_tx_set_final_left(seq, snap_frame);
@@ -1157,7 +1158,6 @@
calc_sequence(scene, seq);
}
}
- SEQ_END
/* test for effects and overlap
* dont use SEQP_BEGIN since that would be recursive */
More information about the Bf-blender-cvs
mailing list