[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35461] trunk/blender/source/blender/ editors/animation/anim_markers.c: Bugfix [#26438] : While grabing a marker with G, cancelling with Esc

[Joshua Leung]

Revision: 35461
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35461
Author:   aligorith
Date:     2011-03-11 00:18:10 +0000 (Fri, 11 Mar 2011)
Log Message:
-----------
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)

Modified Paths:
--------------
    trunk/blender/source/blender/editors/animation/anim_markers.c

Modified: trunk/blender/source/blender/editors/animation/anim_markers.c
===================================================================
--- trunk/blender/source/blender/editors/animation/anim_markers.c	2011-03-10 23:55:22 UTC (rev 35460)
+++ trunk/blender/source/blender/editors/animation/anim_markers.c	2011-03-11 00:18:10 UTC (rev 35461)
@@ -691,18 +691,24 @@
 			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))