diff options
Diffstat (limited to 'source/blender/sequencer')
-rw-r--r-- | source/blender/sequencer/SEQ_edit.h | 3 | ||||
-rw-r--r-- | source/blender/sequencer/intern/strip_edit.c | 22 |
2 files changed, 25 insertions, 0 deletions
diff --git a/source/blender/sequencer/SEQ_edit.h b/source/blender/sequencer/SEQ_edit.h index c8f11803ca8..38ce665563c 100644 --- a/source/blender/sequencer/SEQ_edit.h +++ b/source/blender/sequencer/SEQ_edit.h @@ -33,6 +33,9 @@ struct Scene; struct Sequence; int SEQ_edit_sequence_swap(struct Sequence *seq_a, struct Sequence *seq_b, const char **error_str); +int SEQ_edit_move_strip_to_meta(struct Scene *scene, + struct Sequence *src_seq, + struct Sequence *dst_seqm); void SEQ_edit_flag_for_removal(struct Scene *scene, struct ListBase *seqbase, struct Sequence *seq); diff --git a/source/blender/sequencer/intern/strip_edit.c b/source/blender/sequencer/intern/strip_edit.c index bba026057d2..e21a25a7e4f 100644 --- a/source/blender/sequencer/intern/strip_edit.c +++ b/source/blender/sequencer/intern/strip_edit.c @@ -43,9 +43,11 @@ #include "SEQ_add.h" #include "SEQ_edit.h" #include "SEQ_effects.h" +#include "SEQ_relations.h" #include "SEQ_sequencer.h" #include "SEQ_time.h" #include "SEQ_transform.h" +#include "SEQ_utils.h" int SEQ_edit_sequence_swap(Sequence *seq_a, Sequence *seq_b, const char **error_str) { @@ -102,6 +104,26 @@ int SEQ_edit_sequence_swap(Sequence *seq_a, Sequence *seq_b, const char **error_ return 1; } +int SEQ_edit_move_strip_to_meta(Scene *scene, Sequence *src_seq, Sequence *dst_seqm) +{ + /* Find the appropriate seqbase */ + Editing *ed = SEQ_editing_get(scene, false); + ListBase *seqbase = SEQ_get_seqbase_by_seq(&ed->seqbase, src_seq); + + /* Move to meta */ + BLI_remlink(seqbase, src_seq); + BLI_addtail(&dst_seqm->seqbase, src_seq); + SEQ_relations_invalidate_cache_preprocessed(scene, src_seq); + + /* Update meta */ + SEQ_time_update_sequence(scene, dst_seqm); + if (SEQ_transform_test_overlap(&dst_seqm->seqbase, src_seq)) { + SEQ_transform_seqbase_shuffle(&dst_seqm->seqbase, src_seq, scene); + } + + return 0; +} + static void seq_update_muting_recursive(ListBase *seqbasep, Sequence *metaseq, int mute) { Sequence *seq; |