[Bf-blender-cvs] [5925b1821a5] blender-v3.4-release: Fix T102328: Incorrect strip state after copying

Richard Antalik noreply at git.blender.org
Tue Nov 8 19:35:20 CET 2022


Commit: 5925b1821a5706d59d1504ab3b426ce5df6aff52
Author: Richard Antalik
Date:   Tue Nov 8 19:10:26 2022 +0100
Branches: blender-v3.4-release
https://developer.blender.org/rB5925b1821a5706d59d1504ab3b426ce5df6aff52

Fix T102328: Incorrect strip state after copying

Effect strip start position was translated twice. This is caused by
recent refactoring, see 7afcfe111aacc8bc.

Don't change `seq->start` of attached effect strips during translation
and only rely on `seq_time_update_effects_strip_range` function.

===================================================================

M	source/blender/sequencer/intern/strip_transform.c

===================================================================

diff --git a/source/blender/sequencer/intern/strip_transform.c b/source/blender/sequencer/intern/strip_transform.c
index 2c7bb69da66..4296a8ea35c 100644
--- a/source/blender/sequencer/intern/strip_transform.c
+++ b/source/blender/sequencer/intern/strip_transform.c
@@ -145,7 +145,7 @@ void SEQ_transform_translate_sequence(Scene *evil_scene, Sequence *seq, int delt
     /* Move meta start/end points. */
     seq_time_translate_handles(evil_scene, seq, delta);
   }
-  else { /* All other strip types. */
+  else if (seq->seq1 == NULL && seq->seq2 == NULL) { /* All other strip types. */
     seq->start += delta;
     /* Only to make files usable in older versions. */
     seq->startdisp = SEQ_time_left_handle_frame_get(evil_scene, seq);



More information about the Bf-blender-cvs mailing list