Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/blenkernel/intern/sequencer.c')
-rw-r--r--source/blender/blenkernel/intern/sequencer.c18
1 files changed, 8 insertions, 10 deletions
diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c
index c9af73ce4a9..f2d5c853ef7 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 {
@@ -4273,7 +4273,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)
@@ -5296,13 +5296,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;
@@ -5325,7 +5323,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;