From 9c1fc8497b4f5fc0cf85e2b1a0e6978be281ab0a Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 30 Oct 2009 21:40:07 +0000 Subject: small change to strip-swap, Made keys Alt+L/RArrowKey, added in menu, dont treat color strips like other effects --- source/blender/editors/space_sequencer/sequencer_edit.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to '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 7557d5420bd..a5e89b4023a 100644 --- a/source/blender/editors/space_sequencer/sequencer_edit.c +++ b/source/blender/editors/space_sequencer/sequencer_edit.c @@ -2602,9 +2602,9 @@ static int sequencer_swap_internal_exec(bContext *C, int side) if(seq) { /* disallow effect strips */ - if (seq->effectdata || seq->seq1 || seq->seq2 || seq->seq3) + if ((seq->type!=SEQ_COLOR) && (seq->effectdata || seq->seq1 || seq->seq2 || seq->seq3)) return OPERATOR_CANCELLED; - if (active_seq->effectdata || active_seq->seq1 || active_seq->seq2 || active_seq->seq3) + if ((active_seq->type!=SEQ_COLOR) && (active_seq->effectdata || active_seq->seq1 || active_seq->seq2 || active_seq->seq3)) return OPERATOR_CANCELLED; /* disallow if parent strip (effect strip) is attached */ @@ -2668,4 +2668,4 @@ void SEQUENCER_OT_swap_left(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ -} \ No newline at end of file +} -- cgit v1.2.3