diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2009-10-31 00:40:07 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2009-10-31 00:40:07 +0300 |
| commit | 9c1fc8497b4f5fc0cf85e2b1a0e6978be281ab0a (patch) | |
| tree | 3156fd9fbe1d88d93fc3459f2bee4f290da0a000 /source/blender/editors/space_sequencer | |
| parent | 9aa380b67ee0bf5542fd2b190bc6349b5bf9a537 (diff) | |
small change to strip-swap, Made keys Alt+L/RArrowKey, added in menu, dont treat color strips like other effects
Diffstat (limited to 'source/blender/editors/space_sequencer')
| -rw-r--r-- | source/blender/editors/space_sequencer/sequencer_edit.c | 6 | ||||
| -rw-r--r-- | source/blender/editors/space_sequencer/sequencer_ops.c | 5 |
2 files changed, 6 insertions, 5 deletions
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 +} diff --git a/source/blender/editors/space_sequencer/sequencer_ops.c b/source/blender/editors/space_sequencer/sequencer_ops.c index 64192e57210..90342fc62b5 100644 --- a/source/blender/editors/space_sequencer/sequencer_ops.c +++ b/source/blender/editors/space_sequencer/sequencer_ops.c @@ -149,8 +149,9 @@ void sequencer_keymap(wmKeyConfig *keyconf) WM_keymap_add_item(keymap, "SEQUENCER_OT_next_edit", PAGEUPKEY, KM_PRESS, 0, 0); WM_keymap_add_item(keymap, "SEQUENCER_OT_previous_edit", PAGEDOWNKEY, KM_PRESS, 0, 0); - WM_keymap_add_item(keymap, "SEQUENCER_OT_swap_right", RKEY, KM_PRESS, KM_CTRL, 0); - WM_keymap_add_item(keymap, "SEQUENCER_OT_swap_left", LKEY, KM_PRESS, KM_CTRL, 0); + WM_keymap_add_item(keymap, "SEQUENCER_OT_swap_left", LEFTARROWKEY, KM_PRESS, KM_ALT, 0); + WM_keymap_add_item(keymap, "SEQUENCER_OT_swap_right", RIGHTARROWKEY, KM_PRESS, KM_ALT, 0); + /* Mouse selection, a bit verbose :/ */ WM_keymap_add_item(keymap, "SEQUENCER_OT_select", SELECTMOUSE, KM_PRESS, 0, 0); |