Bugfix [#26438] : While grabing a marker with G, cancelling with Esc
authorJoshua Leung <aligorith@gmail.com>
Fri, 11 Mar 2011 00:18:10 +0000 (00:18 +0000)
committerJoshua Leung <aligorith@gmail.com>
Fri, 11 Mar 2011 00:18:10 +0000 (00:18 +0000)
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)

source/blender/editors/animation/anim_markers.c

index 19fc0588e7e2f876bffed9532f1dcb86cb88091e..b6450ada96f4c226fa6d9f4228f72cb989f51c2a 100644 (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))