[Bf-blender-cvs] [3ef4b3e] master: Better fix for previous trim fix.

[Antony Riakiotakis]

Commit: 3ef4b3e35c54931cb4beceb9b5767ff9a4686e8c
Author: Antony Riakiotakis
Date:   Mon Oct 20 18:29:16 2014 +0200
Branches: master
https://developer.blender.org/rB3ef4b3e35c54931cb4beceb9b5767ff9a4686e8c

Better fix for previous trim fix.

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

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

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

diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c
index 1f87d61..d55638c 100644
--- a/source/blender/editors/space_sequencer/sequencer_edit.c
+++ b/source/blender/editors/space_sequencer/sequencer_edit.c
@@ -1279,7 +1279,7 @@ static int trim_add_sequences_rec(ListBase *seqbasep, Sequence **seq_array, bool
 	int num_items = 0;
 
 	for (seq = seqbasep->first; seq; seq = seq->next) {
-		if ((((seq->type & SEQ_TYPE_EFFECT) == 0) || !do_trim) && (seq->flag & SELECT)) {
+		if (!(seq->type & SEQ_TYPE_EFFECT) && (!do_trim || (seq->flag & SELECT))) {
 			seq_array[offset + num_items] = seq;
 			trim[offset + num_items] = do_trim;
 			num_items++;
@@ -1299,7 +1299,7 @@ static int trim_count_sequences_rec(ListBase *seqbasep, bool first_level) {
 	int trimmed_sequences = 0;
 
 	for (seq = seqbasep->first; seq; seq = seq->next) {
-		if ((((seq->type & SEQ_TYPE_EFFECT) == 0) || !first_level) && (seq->flag & SELECT)) {
+		if (!(seq->type & SEQ_TYPE_EFFECT) && (!first_level || (seq->flag & SELECT))) {
 			trimmed_sequences++;
 
 			if (seq->type == SEQ_TYPE_META) {