Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Montagne <montagne29@wanadoo.fr>2019-01-11 14:01:13 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2019-01-11 21:49:06 +0300
commitc97794520f030b03a87c5c7b386aeb64571f46f6 (patch)
tree3abc8200fd9f145ac13f51a09773328d5e562341 /source/blender/blenkernel/intern/sequencer.c
parent48506a3431fb5b4396f7cf2d9c6a8a208b3c0df5 (diff)
Revert "Fix T55668: Volume Keyframe on Cut-ted Metastrip."
This partially reverts commit bb98e83b99e63348e0396a5ffe5bb2a20ff1607a. It fixed 'strips having same name' issue, but broke handling of animation then. Need to find a better way to handle this.
Diffstat (limited to 'source/blender/blenkernel/intern/sequencer.c')
-rw-r--r--source/blender/blenkernel/intern/sequencer.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c
index 57b3cd41047..ce42f800253 100644
--- a/source/blender/blenkernel/intern/sequencer.c
+++ b/source/blender/blenkernel/intern/sequencer.c
@@ -5516,7 +5516,6 @@ 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);
}