griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Bugfix [#26438] : While grabing a marker with G, cancelling with Esc

Browse Source 
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)
This commit is contained in:
Joshua Leung
2011-03-11 00:18:10 +00:00
parent 6959536abe
commit cda0460c89
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/editors/animation/anim_markers.c
View File

@@ -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))