diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-11-16 23:22:14 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-11-16 23:22:14 +0400 |
| commit | 9b17d39ce031cb89a3e4ea8cbdd0bceb4612871d (patch) | |
| tree | e47e9c198560fee3697571e01de7697143659103 /source/blender/editors/animation/anim_channels_edit.c | |
| parent | 9f51785c4d0038d24fed473dc1d803458f838884 (diff) | |
Fix #29260: Missing "Extend" parameter for Border Select
Added "Extend" flag to border select operators for editors:
- UV Editor
- Sequencer
- NLA
- Info Space
- Graph Editor
- File Browser
- Clip Editor
- Action Editor
- Channels and markers regions
Can be used for custom keymaps.
Diffstat (limited to 'source/blender/editors/animation/anim_channels_edit.c')
| -rw-r--r-- | source/blender/editors/animation/anim_channels_edit.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/source/blender/editors/animation/anim_channels_edit.c b/source/blender/editors/animation/anim_channels_edit.c index b4a86e5d74c..8c699c840dc 100644 --- a/source/blender/editors/animation/anim_channels_edit.c +++ b/source/blender/editors/animation/anim_channels_edit.c @@ -1917,7 +1917,7 @@ static int animchannels_borderselect_exec(bContext *C, wmOperator *op) bAnimContext ac; rcti rect; short selectmode=0; - int gesture_mode; + int gesture_mode, extend; /* get editor data */ if (ANIM_animdata_get_context(C, &ac) == 0) @@ -1928,8 +1928,13 @@ static int animchannels_borderselect_exec(bContext *C, wmOperator *op) rect.ymin= RNA_int_get(op->ptr, "ymin"); rect.xmax= RNA_int_get(op->ptr, "xmax"); rect.ymax= RNA_int_get(op->ptr, "ymax"); - + gesture_mode= RNA_int_get(op->ptr, "gesture_mode"); + extend= RNA_boolean_get(op->ptr, "extend"); + + if(!extend) + ANIM_deselect_anim_channels(&ac, ac.data, ac.datatype, 1, ACHANNEL_SETFLAG_CLEAR); + if (gesture_mode == GESTURE_MODAL_SELECT) selectmode = ACHANNEL_SETFLAG_ADD; else @@ -1963,7 +1968,7 @@ static void ANIM_OT_channels_select_border(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* rna */ - WM_operator_properties_gesture_border(ot, FALSE); + WM_operator_properties_gesture_border(ot, TRUE); } /* ******************* Rename Operator ***************************** */ |