From 6781cf0049bf2297eadb264227fb9a84e79ecf46 Mon Sep 17 00:00:00 2001 From: Antony Riakiotakis Date: Wed, 1 Jul 2015 17:32:56 +0200 Subject: Refactoring: Make sure SEQ_TYPE_EFFECT is only used as a flag, not as number comparison. This should allow us to add new non-effect types in between effect types (every 8 indices). Dirty, but alternative of separating type/subtype means we lose forward compatibility. --- source/blender/blenkernel/intern/sequencer.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'source/blender/blenkernel/intern/sequencer.c') diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c index 19124ddc549..6b6839d870a 100644 --- a/source/blender/blenkernel/intern/sequencer.c +++ b/source/blender/blenkernel/intern/sequencer.c @@ -1125,7 +1125,7 @@ const char *BKE_sequence_give_name(Sequence *seq) const char *name = give_seqname_by_type(seq->type); if (!name) { - if (seq->type < SEQ_TYPE_EFFECT) { + if (!(seq->type & SEQ_TYPE_EFFECT)) { return seq->strip->dir; } else { @@ -4214,7 +4214,7 @@ void BKE_sequence_single_fix(Sequence *seq) bool BKE_sequence_tx_test(Sequence *seq) { - return (seq->type < SEQ_TYPE_EFFECT) || (BKE_sequence_effect_get_num_inputs(seq->type) == 0); + return !(seq->type & SEQ_TYPE_EFFECT) || (BKE_sequence_effect_get_num_inputs(seq->type) == 0); } static bool seq_overlap(Sequence *seq1, Sequence *seq2) @@ -5237,13 +5237,11 @@ static Sequence *seq_dupli(Scene *scene, Scene *scene_to, Sequence *seq, int dup seqn->strip->stripdata = MEM_dupallocN(seq->strip->stripdata); } - else if (seq->type >= SEQ_TYPE_EFFECT) { - if (seq->type & SEQ_TYPE_EFFECT) { - struct SeqEffectHandle sh; - sh = BKE_sequence_get_effect(seq); - if (sh.copy) - sh.copy(seq, seqn); - } + else if (seq->type & SEQ_TYPE_EFFECT) { + struct SeqEffectHandle sh; + sh = BKE_sequence_get_effect(seq); + if (sh.copy) + sh.copy(seq, seqn); seqn->strip->stripdata = NULL; @@ -5266,7 +5264,7 @@ static void seq_new_fix_links_recursive(Sequence *seq) { SequenceModifierData *smd; - if (seq->type >= SEQ_TYPE_EFFECT) { + 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; -- cgit v1.2.3