Commit: 64a87ee843ab1cf72644083be4d3111048f9d698
Author: Bastien Montagne
Date: Thu Aug 10 15:06:53 2017 +0200
Branches: master
https://developer.blender.org/rB64a87ee843ab1cf72644083be4d3111048f9d698
Cleanup: make seq dupli scene operands' names match global copying convention.
Followup to rB1037b90cb831b, forgot to save that file :(
===================================================================
M source/blender/blenkernel/intern/sequencer.c
===================================================================
diff --git a/source/blender/blenkernel/intern/sequencer.c
b/source/blender/blenkernel/intern/sequencer.c
index f72f3d2f0b1..b09b3ecda07 100644
--- a/source/blender/blenkernel/intern/sequencer.c
+++ b/source/blender/blenkernel/intern/sequencer.c
@@ -5491,16 +5491,16 @@ static void seq_new_fix_links_recursive(Sequence *seq)
}
}
-Sequence *BKE_sequence_dupli_recursive(const Scene *scene, Scene *scene_to,
Sequence *seq, int dupe_flag)
+Sequence *BKE_sequence_dupli_recursive(const Scene *scene_src, Scene
*scene_dst, Sequence *seq, int dupe_flag)
{
Sequence *seqn;
seq->tmp = NULL;
- seqn = seq_dupli(scene, scene_to, seq, dupe_flag, 0);
+ seqn = seq_dupli(scene_src, scene_dst, seq, dupe_flag, 0);
if (seq->type == SEQ_TYPE_META) {
Sequence *s;
for (s = seq->seqbase.first; s; s = s->next) {
- Sequence *n = BKE_sequence_dupli_recursive(scene,
scene_to, s, dupe_flag);
+ Sequence *n = BKE_sequence_dupli_recursive(scene_src,
scene_dst, s, dupe_flag);
if (n) {
BLI_addtail(&seqn->seqbase, n);
}
@@ -5513,19 +5513,19 @@ Sequence *BKE_sequence_dupli_recursive(const Scene
*scene, Scene *scene_to, Sequ
}
void BKE_sequence_base_dupli_recursive(
- const Scene *scene, Scene *scene_to, ListBase *nseqbase, const
ListBase *seqbase,
+ const Scene *scene_src, Scene *scene_dst, ListBase *nseqbase, const
ListBase *seqbase,
int dupe_flag, const int flag)
{
Sequence *seq;
Sequence *seqn = NULL;
- Sequence *last_seq = BKE_sequencer_active_get((Scene *)scene);
+ Sequence *last_seq = BKE_sequencer_active_get((Scene *)scene_src);
/* always include meta's strips */
int dupe_flag_recursive = dupe_flag | SEQ_DUPE_ALL;
for (seq = seqbase->first; seq; seq = seq->next) {
seq->tmp = NULL;
if ((seq->flag & SELECT) || (dupe_flag & SEQ_DUPE_ALL)) {
- seqn = seq_dupli(scene, scene_to, seq, dupe_flag, flag);
+ seqn = seq_dupli(scene_src, scene_dst, seq, dupe_flag,
flag);
if (seqn) { /*should never fail */
if (dupe_flag & SEQ_DUPE_CONTEXT) {
seq->flag &= ~SEQ_ALLSEL;
@@ -5535,13 +5535,13 @@ void BKE_sequence_base_dupli_recursive(
BLI_addtail(nseqbase, seqn);
if (seq->type == SEQ_TYPE_META) {
BKE_sequence_base_dupli_recursive(
- scene, scene_to,
&seqn->seqbase, &seq->seqbase,
+ scene_src, scene_dst,
&seqn->seqbase, &seq->seqbase,
dupe_flag_recursive, flag);
}
if (dupe_flag & SEQ_DUPE_CONTEXT) {
if (seq == last_seq) {
-
BKE_sequencer_active_set(scene_to, seqn);
+
BKE_sequencer_active_set(scene_dst, seqn);
}
}
}
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
