diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-07-23 18:52:52 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-07-23 18:52:52 +0300 |
| commit | adbccae4b48acdf58d8b715be660ba522a5dfad6 (patch) | |
| tree | e0298dc13783d8d25d6656c9bc84dd7e3bf9e08a /source/blender/blenkernel/intern/sequencer.c | |
| parent | 8876e3aae25ad0e74baf362413b0fd113aa5b638 (diff) | |
| parent | bb98e83b99e63348e0396a5ffe5bb2a20ff1607a (diff) | |
Merge branch 'master' into blender2.8
Note: Moved doversion of VSE strips uniquename to 2.8 versionning area,
and raised accordingly current file subversion, since that bug also
affected previous 2.8 .blend files...
Conflicts:
source/blender/blenkernel/BKE_blender_version.h
Diffstat (limited to 'source/blender/blenkernel/intern/sequencer.c')
| -rw-r--r-- | source/blender/blenkernel/intern/sequencer.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c index d857db7e276..b5b4ec5cd41 100644 --- a/source/blender/blenkernel/intern/sequencer.c +++ b/source/blender/blenkernel/intern/sequencer.c @@ -5530,6 +5530,7 @@ static Sequence *seq_dupli(const Scene *scene_src, Scene *scene_dst, Sequence *s if (scene_src == scene_dst) { if (dupe_flag & SEQ_DUPE_UNIQUE_NAME) { + /* TODO this is broken in case of Meta strips recursive duplication... Not trivial to fix. */ BKE_sequence_base_unique_name_recursive(&scene_dst->ed->seqbase, seqn); } |