[Bf-blender-cvs] [3433d1b7f43] master: Fix T86355: Added effect strip has wrong length
Richard Antalik
noreply at git.blender.org
Sat Mar 20 01:42:03 CET 2021
Commit: 3433d1b7f43a587312e05aa4b5b3d7a44b57bc1b
Author: Richard Antalik
Date: Sat Mar 20 01:34:12 2021 +0100
Branches: master
https://developer.blender.org/rB3433d1b7f43a587312e05aa4b5b3d7a44b57bc1b
Fix T86355: Added effect strip has wrong length
SEQ_add_effect_strip used SeqLoadData.image.end_frame to set end
frame. This was mistake introduced in last refactoring patch.
Use effect data, not image data, when adding effect strips.
Reviewed By: sergey
Differential Revision: D10633
===================================================================
M source/blender/editors/space_sequencer/sequencer_add.c
M source/blender/sequencer/intern/strip_add.c
===================================================================
diff --git a/source/blender/editors/space_sequencer/sequencer_add.c b/source/blender/editors/space_sequencer/sequencer_add.c
index 5d6d24dae74..4ccbd665b8c 100644
--- a/source/blender/editors/space_sequencer/sequencer_add.c
+++ b/source/blender/editors/space_sequencer/sequencer_add.c
@@ -255,6 +255,7 @@ static void load_data_init_from_operator(SeqLoadData *load_data, bContext *C, wm
if ((prop = RNA_struct_find_property(op->ptr, "frame_end"))) {
load_data->image.end_frame = RNA_property_int_get(op->ptr, prop);
+ load_data->effect.end_frame = load_data->image.end_frame;
}
if ((prop = RNA_struct_find_property(op->ptr, "cache")) &&
diff --git a/source/blender/sequencer/intern/strip_add.c b/source/blender/sequencer/intern/strip_add.c
index 99a01dbe791..d90524ddbd7 100644
--- a/source/blender/sequencer/intern/strip_add.c
+++ b/source/blender/sequencer/intern/strip_add.c
@@ -226,8 +226,9 @@ Sequence *SEQ_add_effect_strip(Scene *scene, ListBase *seqbase, struct SeqLoadDa
if (!load_data->effect.seq1) {
seq->len = 1; /* Effect is generator, set non zero length. */
- SEQ_transform_set_right_handle_frame(seq, load_data->image.end_frame);
+ SEQ_transform_set_right_handle_frame(seq, load_data->effect.end_frame);
}
+
SEQ_relations_update_changed_seq_and_deps(scene, seq, 1, 1); /* Runs SEQ_time_update_sequence. */
seq_add_set_name(seq, load_data);
seq_add_generic_update(scene, seqbase, seq);
More information about the Bf-blender-cvs
mailing list