diff options
| author | Joshua Leung <aligorith@gmail.com> | 2011-03-11 03:18:10 +0300 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2011-03-11 03:18:10 +0300 |
| commit | cda0460c89fae4edcbc277e2c308bbf00135f931 (patch) | |
| tree | f9062e769a2e1c50306f7bba0ad53871140724dd /source/blender/editors/animation/anim_markers.c | |
| parent | 6959536abea78cf3f556216665599ad442dc3a12 (diff) | |
Bugfix [#26438] : While grabing a marker with G, cancelling with Esc
does exit cancelling the translation (as expected), while RMB doesn't,
it works same as LMB
This should fix the remaining issues with marker tweak-grab mappings
(hardcoded for right-mouse for now)
Diffstat (limited to 'source/blender/editors/animation/anim_markers.c')
| -rw-r--r-- | source/blender/editors/animation/anim_markers.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/source/blender/editors/animation/anim_markers.c b/source/blender/editors/animation/anim_markers.c index 19fc0588e7e..b6450ada96f 100644 --- a/source/blender/editors/animation/anim_markers.c +++ b/source/blender/editors/animation/anim_markers.c @@ -691,18 +691,24 @@ static int ed_marker_move_modal(bContext *C, wmOperator *op, wmEvent *evt) ed_marker_move_cancel(C, op); return OPERATOR_CANCELLED; + case RIGHTMOUSE: + /* press = user manually demands transform to be cancelled */ + if (evt->val == KM_PRESS) { + ed_marker_move_cancel(C, op); + return OPERATOR_CANCELLED; + } + /* else continue; <--- see if release event should be caught for tweak-end */ + case RETKEY: case PADENTER: case LEFTMOUSE: case MIDDLEMOUSE: - case RIGHTMOUSE: if (WM_modal_tweak_exit(evt, mm->event_type)) { ed_marker_move_exit(C, op); WM_event_add_notifier(C, NC_SCENE|ND_MARKERS, NULL); WM_event_add_notifier(C, NC_ANIMATION|ND_MARKERS, NULL); return OPERATOR_FINISHED; } - break; case MOUSEMOVE: if (hasNumInput(&mm->num)) |