[Bf-blender-cvs] [be6e56b36be] master: Cleanup: Fix errors in previous commit

Richard Antalik noreply at git.blender.org
Wed Dec 1 18:29:58 CET 2021


Commit: be6e56b36be5d4940960689f473e48f4b121866c
Author: Richard Antalik
Date:   Wed Dec 1 18:09:02 2021 +0100
Branches: master
https://developer.blender.org/rBbe6e56b36be5d4940960689f473e48f4b121866c

Cleanup: Fix errors in previous commit

After 1ef8ef4941dd there were build warnings because of unused
arguments. Also missed to change code to iterate `strips` instead of
`seqbase` in 2 functions.

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

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

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

diff --git a/source/blender/editors/space_sequencer/sequencer_select.c b/source/blender/editors/space_sequencer/sequencer_select.c
index 90dfcc7b14d..47696ab9256 100644
--- a/source/blender/editors/space_sequencer/sequencer_select.c
+++ b/source/blender/editors/space_sequencer/sequencer_select.c
@@ -1799,7 +1799,7 @@ static const EnumPropertyItem sequencer_prop_select_grouped_types[] = {
 #define SEQ_CHANNEL_CHECK(_seq, _chan) (ELEM((_chan), 0, (_seq)->machine))
 
 static bool select_grouped_type(SeqCollection *strips,
-                                ListBase *seqbase,
+                                ListBase *UNUSED(seqbase),
                                 Sequence *actseq,
                                 const int channel)
 {
@@ -1817,7 +1817,7 @@ static bool select_grouped_type(SeqCollection *strips,
 }
 
 static bool select_grouped_type_basic(SeqCollection *strips,
-                                      ListBase *seqbase,
+                                      ListBase *UNUSED(seqbase),
                                       Sequence *actseq,
                                       const int channel)
 {
@@ -1836,7 +1836,7 @@ static bool select_grouped_type_basic(SeqCollection *strips,
 }
 
 static bool select_grouped_type_effect(SeqCollection *strips,
-                                       ListBase *seqbase,
+                                       ListBase *UNUSED(seqbase),
                                        Sequence *actseq,
                                        const int channel)
 {
@@ -1856,7 +1856,7 @@ static bool select_grouped_type_effect(SeqCollection *strips,
 }
 
 static bool select_grouped_data(SeqCollection *strips,
-                                ListBase *seqbase,
+                                ListBase *UNUSED(seqbase),
                                 Sequence *actseq,
                                 const int channel)
 {
@@ -1911,7 +1911,7 @@ static bool select_grouped_data(SeqCollection *strips,
 }
 
 static bool select_grouped_effect(SeqCollection *strips,
-                                  ListBase *seqbase,
+                                  ListBase *UNUSED(seqbase),
                                   Sequence *actseq,
                                   const int channel)
 {
@@ -1922,14 +1922,15 @@ static bool select_grouped_effect(SeqCollection *strips,
     effects[i] = false;
   }
 
-  LISTBASE_FOREACH (Sequence *, seq, seqbase) {
+  Sequence *seq;
+  SEQ_ITERATOR_FOREACH (seq, strips) {
     if (SEQ_CHANNEL_CHECK(seq, channel) && (seq->type & SEQ_TYPE_EFFECT) &&
         ELEM(actseq, seq->seq1, seq->seq2, seq->seq3)) {
       effects[seq->type] = true;
     }
   }
 
-  LISTBASE_FOREACH (Sequence *, seq, seqbase) {
+  SEQ_ITERATOR_FOREACH (seq, strips) {
     if (SEQ_CHANNEL_CHECK(seq, channel) && effects[seq->type]) {
       if (seq->seq1) {
         seq->seq1->flag |= SELECT;
@@ -1947,11 +1948,14 @@ static bool select_grouped_effect(SeqCollection *strips,
   return changed;
 }
 
-static bool select_grouped_time_overlap(SeqCollection *strips, ListBase *seqbase, Sequence *actseq)
+static bool select_grouped_time_overlap(SeqCollection *strips,
+                                        ListBase *UNUSED(seqbase),
+                                        Sequence *actseq)
 {
   bool changed = false;
 
-  LISTBASE_FOREACH (Sequence *, seq, seqbase) {
+  Sequence *seq;
+  SEQ_ITERATOR_FOREACH (seq, strips) {
     if (seq->startdisp < actseq->enddisp && seq->enddisp > actseq->startdisp) {
       seq->flag |= SELECT;
       changed = true;



More information about the Bf-blender-cvs mailing list