diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2009-10-19 15:39:57 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2009-10-19 15:39:57 +0400 |
| commit | a216ce6cf84fdb27011020abc08b4d58aeccf78b (patch) | |
| tree | d6eeb7a077b5f245c7270c09935d16c7c8ff8b7c /source/blender/editors/space_sequencer | |
| parent | 915c40708e033f20928ccfc0355534b691473369 (diff) | |
- fixed python error when there is no active object
- made sequence strip selection more like object mode - only de-select the active with Shift+RMB
Diffstat (limited to 'source/blender/editors/space_sequencer')
| -rw-r--r-- | source/blender/editors/space_sequencer/sequencer_select.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/source/blender/editors/space_sequencer/sequencer_select.c b/source/blender/editors/space_sequencer/sequencer_select.c index fe46cb178ae..e03cb6ddc94 100644 --- a/source/blender/editors/space_sequencer/sequencer_select.c +++ b/source/blender/editors/space_sequencer/sequencer_select.c @@ -296,8 +296,8 @@ static int sequencer_select_invoke(bContext *C, wmOperator *op, wmEvent *event) short mval[2]; - Sequence *seq,*neighbor; - int hand,sel_side, shift= 0; // XXX + Sequence *seq,*neighbor, *act_orig; + int hand,sel_side; TimeMarker *marker; if(ed==NULL) @@ -311,7 +311,7 @@ static int sequencer_select_invoke(bContext *C, wmOperator *op, wmEvent *event) if (marker) { int oldflag; /* select timeline marker */ - if (shift) { + if (extend) { oldflag= marker->flag; if (oldflag & SELECT) marker->flag &= ~SELECT; @@ -326,6 +326,7 @@ static int sequencer_select_invoke(bContext *C, wmOperator *op, wmEvent *event) } else { seq= find_nearest_seq(scene, v2d, &hand, mval); + act_orig= ed->act_seq; if(extend == 0 && linked_left==0 && linked_right==0) deselect_all_seq(scene); @@ -344,7 +345,7 @@ static int sequencer_select_invoke(bContext *C, wmOperator *op, wmEvent *event) } } - if(extend && (seq->flag & SELECT)) { + if(extend && (seq->flag & SELECT) && ed->act_seq == act_orig ) { switch(hand) { case SEQ_SIDE_NONE: if (linked_left==0 && linked_right==0) |