[Bf-blender-cvs] [4d856ecb118] master: Cleanup: Fix warnings

Richard Antalik noreply at git.blender.org
Wed Mar 31 12:35:33 CEST 2021


Commit: 4d856ecb11866805fa4e9ffb7f7cc7a4930b0d52
Author: Richard Antalik
Date:   Wed Mar 31 12:15:05 2021 +0200
Branches: master
https://developer.blender.org/rB4d856ecb11866805fa4e9ffb7f7cc7a4930b0d52

Cleanup: Fix warnings

Introduced in b128ffd53970

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

M	source/blender/editors/space_sequencer/sequencer_modifier.c
M	source/blender/editors/space_sequencer/sequencer_select.c

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

diff --git a/source/blender/editors/space_sequencer/sequencer_modifier.c b/source/blender/editors/space_sequencer/sequencer_modifier.c
index 5c120ac2e11..9b3ecacceb9 100644
--- a/source/blender/editors/space_sequencer/sequencer_modifier.c
+++ b/source/blender/editors/space_sequencer/sequencer_modifier.c
@@ -230,7 +230,6 @@ static int strip_modifier_copy_exec(bContext *C, wmOperator *op)
   Scene *scene = CTX_data_scene(C);
   Editing *ed = scene->ed;
   Sequence *seq = SEQ_select_active_get(scene);
-  Sequence *seq_iter;
   const int type = RNA_enum_get(op->ptr, "type");
 
   if (!seq || !seq->modifiers.first) {
diff --git a/source/blender/editors/space_sequencer/sequencer_select.c b/source/blender/editors/space_sequencer/sequencer_select.c
index 0cf43409f2e..a9f8a70d61e 100644
--- a/source/blender/editors/space_sequencer/sequencer_select.c
+++ b/source/blender/editors/space_sequencer/sequencer_select.c
@@ -548,11 +548,12 @@ static int sequencer_select_exec(bContext *C, wmOperator *op)
 
     const float x = UI_view2d_region_to_view_x(v2d, mval[0]);
 
-    LISTBASE_FOREACH (Sequence *, seq, SEQ_active_seqbase_get(ed)) {
-      if (((x < CFRA) && (seq->enddisp <= CFRA)) || ((x >= CFRA) && (seq->startdisp >= CFRA))) {
+    LISTBASE_FOREACH (Sequence *, seq_iter, SEQ_active_seqbase_get(ed)) {
+      if (((x < CFRA) && (seq_iter->enddisp <= CFRA)) ||
+          ((x >= CFRA) && (seq_iter->startdisp >= CFRA))) {
         /* Select left or right. */
-        seq->flag |= SELECT;
-        recurs_sel_seq(seq);
+        seq_iter->flag |= SELECT;
+        recurs_sel_seq(seq_iter);
       }
     }
 
@@ -1623,7 +1624,6 @@ static bool select_grouped_time_overlap(Editing *ed, Sequence *actseq)
 
 static bool select_grouped_effect_link(Editing *ed, Sequence *actseq, const int channel)
 {
-  Sequence *seq = NULL;
   bool changed = false;
   const bool is_audio = ((actseq->type == SEQ_TYPE_META) || SEQ_IS_SOUND(actseq));
   int startdisp = actseq->startdisp;
@@ -1637,6 +1637,7 @@ static bool select_grouped_effect_link(Editing *ed, Sequence *actseq, const int
 
   actseq->tmp = POINTER_FROM_INT(true);
 
+  Sequence *seq = NULL;
   for (SEQ_iterator_begin(ed, &iter, true); iter.valid; SEQ_iterator_next(&iter)) {
     seq = iter.seq;



More information about the Bf-blender-cvs mailing list