blender
/
blender
137
411
Fork 593
Code Issues 6.3k Pull Requests 768 Projects 19 Wiki Activity

Fix T44458 strip modifier mask not copied correctly when doing scene 

copy.

What happens is that the strip is copied, but it still refers to the old
scene. Here we need to fix this by referring to the copy of the strip
and also do it after copying to make it order independent.
This commit is contained in:
Antonis Ryakiotakis 2015-04-20 11:51:43 +02:00
parent 0aa2eed0c2
commit 9b4c8a2507
Notes: blender-bot 2023-02-14 09:13:13 +01:00 
Referenced by issue #44458, VSE strips forget their masks' names after full copy of scene
1 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
source/blender/blenkernel/intern/sequencer.c
View File

@ -5227,10 +5227,6 @@ static Sequence *seq_dupli(Scene *scene, Scene *scene_to, Sequence *seq, int dup
MEM_dupallocN(seq->strip->stripdata);
}
else if (seq->type >= SEQ_TYPE_EFFECT) {
if (seq->seq1 && seq->seq1->tmp) seqn->seq1 = seq->seq1->tmp;
if (seq->seq2 && seq->seq2->tmp) seqn->seq2 = seq->seq2->tmp;
if (seq->seq3 && seq->seq3->tmp) seqn->seq3 = seq->seq3->tmp;
if (seq->type & SEQ_TYPE_EFFECT) {
struct SeqEffectHandle sh;
sh = BKE_sequence_get_effect(seq);
@ -5255,6 +5251,28 @@ static Sequence *seq_dupli(Scene *scene, Scene *scene_to, Sequence *seq, int dup
return seqn;
}
static void seq_new_fix_links_recursive(Sequence *seq)
{
SequenceModifierData *smd;
if (seq->type >= SEQ_TYPE_EFFECT) {
if (seq->seq1 && seq->seq1->tmp) seq->seq1 = seq->seq1->tmp;
if (seq->seq2 && seq->seq2->tmp) seq->seq2 = seq->seq2->tmp;
if (seq->seq3 && seq->seq3->tmp) seq->seq3 = seq->seq3->tmp;
}
else if (seq->type == SEQ_TYPE_META) {
Sequence *seqn;
for (seqn = seq->seqbase.first; seqn; seqn = seqn->next) {
seq_new_fix_links_recursive(seqn);
}
}
for (smd = seq->modifiers.first; smd; smd = smd->next) {
if (smd->mask_sequence && smd->mask_sequence->tmp)
smd->mask_sequence = smd->mask_sequence->tmp;
}
}
Sequence *BKE_sequence_dupli_recursive(Scene *scene, Scene *scene_to, Sequence *seq, int dupe_flag)
{
Sequence *seqn = seq_dupli(scene, scene_to, seq, dupe_flag);
@ -5267,6 +5285,9 @@ Sequence *BKE_sequence_dupli_recursive(Scene *scene, Scene *scene_to, Sequence *
}
}
}
seq_new_fix_links_recursive(seqn);
return seqn;
}
@ -5305,6 +5326,11 @@ void BKE_sequence_base_dupli_recursive(
}
}
}
/* fix modifier linking */
for (seq = nseqbase->first; seq; seq = seq->next) {
seq_new_fix_links_recursive(seq);
}
}
/* called on draw, needs to be fast,