diff options
author | Richard Antalik <richardantalik@gmail.com> | 2020-04-27 00:44:12 +0300 |
---|---|---|
committer | Richard Antalik <richardantalik@gmail.com> | 2020-04-27 00:44:12 +0300 |
commit | 576ecbd694144abd94be18b99da92d78151cde5e (patch) | |
tree | 1c58e3bf45c2e1acee6c459abee895b0c6c0997c /source/blender/blenkernel/intern/sequencer.c | |
parent | a2de3d86de29575698f42a167b8d2c4acf05c38e (diff) | |
parent | dea1c1b9eb4378bcf4d2f097f3b90a90076f8edd (diff) |
Merge branch 'blender-v2.83-release'
Diffstat (limited to 'source/blender/blenkernel/intern/sequencer.c')
-rw-r--r-- | source/blender/blenkernel/intern/sequencer.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c index c0ab5cf5816..5136c526416 100644 --- a/source/blender/blenkernel/intern/sequencer.c +++ b/source/blender/blenkernel/intern/sequencer.c @@ -5816,7 +5816,7 @@ void BKE_sequence_base_dupli_recursive(const Scene *scene_src, Sequence *seqn = NULL; Sequence *last_seq = BKE_sequencer_active_get((Scene *)scene_src); /* always include meta's strips */ - int dupe_flag_recursive = dupe_flag | SEQ_DUPE_ALL; + int dupe_flag_recursive = dupe_flag | SEQ_DUPE_ALL | SEQ_DUPE_IS_RECURSIVE_CALL; for (seq = seqbase->first; seq; seq = seq->next) { seq->tmp = NULL; @@ -5842,6 +5842,12 @@ void BKE_sequence_base_dupli_recursive(const Scene *scene_src, } } + /* Fix modifier links recursively from the top level only, when all sequences have been + * copied. */ + if (dupe_flag & SEQ_DUPE_IS_RECURSIVE_CALL) { + return; + } + /* fix modifier linking */ for (seq = nseqbase->first; seq; seq = seq->next) { seq_new_fix_links_recursive(seq); |