Commit: 1037b90cb831bfc454966f08fe3ff96843e2499b
Author: Bastien Montagne
Date:   Thu Aug 10 13:00:01 2017 +0200
Branches: master
https://developer.blender.org/rB1037b90cb831bfc454966f08fe3ff96843e2499b

Cleanup: make seq dupli scene operands' names match global copying convention.

===================================================================

M       source/blender/blenkernel/BKE_sequencer.h
M       source/blender/blenkernel/intern/sequencer.c

===================================================================

diff --git a/source/blender/blenkernel/BKE_sequencer.h 
b/source/blender/blenkernel/BKE_sequencer.h
index f3e3abab87a..657e99f05d1 100644
--- a/source/blender/blenkernel/BKE_sequencer.h
+++ b/source/blender/blenkernel/BKE_sequencer.h
@@ -336,7 +336,7 @@ bool BKE_sequence_base_shuffle_time(ListBase *seqbasep, 
struct Scene *evil_scene
 bool BKE_sequence_base_isolated_sel_check(struct ListBase *seqbase);
 void BKE_sequencer_free_imbuf(struct Scene *scene, struct ListBase *seqbasep, 
bool for_render);
 struct Sequence *BKE_sequence_dupli_recursive(
-        const struct Scene *scene, struct Scene *scene_to, struct Sequence 
*seq, int dupe_flag);
+        const struct Scene *scene_src, struct Scene *scene_dst, struct 
Sequence *seq, int dupe_flag);
 int BKE_sequence_swap(struct Sequence *seq_a, struct Sequence *seq_b, const 
char **error_str);
 
 bool BKE_sequence_check_depend(struct Sequence *seq, struct Sequence *cur);
@@ -353,7 +353,7 @@ void BKE_sequencer_refresh_sound_length(struct Scene 
*scene);
 
 void BKE_sequence_base_unique_name_recursive(ListBase *seqbasep, struct 
Sequence *seq);
 void BKE_sequence_base_dupli_recursive(
-        const struct Scene *scene, struct Scene *scene_to, struct ListBase 
*nseqbase, const struct ListBase *seqbase,
+        const struct Scene *scene_src, struct Scene *scene_dst, struct 
ListBase *nseqbase, const struct ListBase *seqbase,
         int dupe_flag, const int flag);
 bool BKE_sequence_is_valid_check(struct Sequence *seq);
 
diff --git a/source/blender/blenkernel/intern/sequencer.c 
b/source/blender/blenkernel/intern/sequencer.c
index 76335f484cf..f72f3d2f0b1 100644
--- a/source/blender/blenkernel/intern/sequencer.c
+++ b/source/blender/blenkernel/intern/sequencer.c
@@ -5371,7 +5371,7 @@ Sequence *BKE_sequencer_add_movie_strip(bContext *C, 
ListBase *seqbasep, SeqLoad
        return seq;
 }
 
-static Sequence *seq_dupli(const Scene *scene, Scene *scene_to, Sequence *seq, 
int dupe_flag, const int flag)
+static Sequence *seq_dupli(const Scene *scene_src, Scene *scene_dst, Sequence 
*seq, int dupe_flag, const int flag)
 {
        Sequence *seqn = MEM_dupallocN(seq);
 
@@ -5415,7 +5415,7 @@ static Sequence *seq_dupli(const Scene *scene, Scene 
*scene_to, Sequence *seq, i
        else if (seq->type == SEQ_TYPE_SCENE) {
                seqn->strip->stripdata = NULL;
                if (seq->scene_sound)
-                       seqn->scene_sound = 
BKE_sound_scene_add_scene_sound_defaults(scene_to, seqn);
+                       seqn->scene_sound = 
BKE_sound_scene_add_scene_sound_defaults(scene_dst, seqn);
        }
        else if (seq->type == SEQ_TYPE_MOVIECLIP) {
                /* avoid assert */
@@ -5432,7 +5432,7 @@ static Sequence *seq_dupli(const Scene *scene, Scene 
*scene_to, Sequence *seq, i
                seqn->strip->stripdata =
                        MEM_dupallocN(seq->strip->stripdata);
                if (seq->scene_sound)
-                       seqn->scene_sound = 
BKE_sound_add_scene_sound_defaults(scene_to, seqn);
+                       seqn->scene_sound = 
BKE_sound_add_scene_sound_defaults(scene_dst, seqn);
 
                if ((flag & LIB_ID_CREATE_NO_USER_REFCOUNT) == 0) {
                        id_us_plus((ID *)seqn->sound);
@@ -5456,13 +5456,13 @@ static Sequence *seq_dupli(const Scene *scene, Scene 
*scene_to, Sequence *seq, i
                BLI_assert(0);
        }
 
-       if (scene == scene_to) {
+       if (scene_src == scene_dst) {
                if (dupe_flag & SEQ_DUPE_UNIQUE_NAME) {
-                       
BKE_sequence_base_unique_name_recursive(&scene_to->ed->seqbase, seqn);
+                       
BKE_sequence_base_unique_name_recursive(&scene_dst->ed->seqbase, seqn);
                }
 
                if (dupe_flag & SEQ_DUPE_ANIM) {
-                       BKE_sequencer_dupe_animdata(scene_to, seq->name + 2, 
seqn->name + 2);
+                       BKE_sequencer_dupe_animdata(scene_dst, seq->name + 2, 
seqn->name + 2);
                }
        }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to