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:
authorAntony Riakiotakis <kalast@gmail.com>2015-07-01 18:37:14 +0300
committerAntony Riakiotakis <kalast@gmail.com>2015-07-01 18:37:14 +0300
commit12a8d7e6c40c8f01699363d23190b556e6877520 (patch)
tree60d7b116bc3f854ed17776d1c2b3893007b4ca34
parent6781cf0049bf2297eadb264227fb9a84e79ecf46 (diff)
Cleanup: Make select grouped effect code a bit more readable
-rw-r--r--source/blender/editors/space_sequencer/sequencer_select.c6
-rw-r--r--source/blender/makesdna/DNA_sequence_types.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/space_sequencer/sequencer_select.c b/source/blender/editors/space_sequencer/sequencer_select.c
index 4fbe0c6a241..c9fdb4ac5f5 100644
--- a/source/blender/editors/space_sequencer/sequencer_select.c
+++ b/source/blender/editors/space_sequencer/sequencer_select.c
@@ -1044,15 +1044,15 @@ static bool select_grouped_effect(Editing *ed, Sequence *actseq)
{
Sequence *seq;
bool changed = false;
- bool effects[SEQ_TYPE_EFFECT_MAX + 1];
+ bool effects[SEQ_TYPE_MAX + 1];
int i;
- for (i = 0; i <= SEQ_TYPE_EFFECT_MAX; i++)
+ for (i = 0; i <= SEQ_TYPE_MAX; i++)
effects[i] = false;
SEQP_BEGIN (ed, seq)
{
- if (ELEM(actseq, seq->seq1, seq->seq2, seq->seq3)) {
+ if ((seq->type & SEQ_TYPE_EFFECT) && ELEM(actseq, seq->seq1, seq->seq2, seq->seq3)) {
effects[seq->type] = true;
}
}
diff --git a/source/blender/makesdna/DNA_sequence_types.h b/source/blender/makesdna/DNA_sequence_types.h
index 76c27fd3547..7904d056e1a 100644
--- a/source/blender/makesdna/DNA_sequence_types.h
+++ b/source/blender/makesdna/DNA_sequence_types.h
@@ -463,7 +463,7 @@ enum {
SEQ_TYPE_MULTICAM = 30,
SEQ_TYPE_ADJUSTMENT = 31,
SEQ_TYPE_GAUSSIAN_BLUR = 40,
- SEQ_TYPE_EFFECT_MAX = 40
+ SEQ_TYPE_MAX = 40
};
#define SEQ_MOVIECLIP_RENDER_UNDISTORTED (1 << 0)