[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [21677] branches/blender2.5/blender/source /blender/editors/transform/transform.c: Second round of transform mouse buttons experiment.

[Martin Poirier]

Revision: 21677
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21677
Author:   theeth
Date:     2009-07-18 17:02:12 +0200 (Sat, 18 Jul 2009)

Log Message:
-----------
Second round of transform mouse buttons experiment.

Confirm on LMB up but cancel on RMB down.

This works well with hotkeys, manipulator, RMB+drag and gesture (when they are added back).

The question is do we stick with one scheme for all or have separate keymaps for different "calling mode".

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/editors/transform/transform.c

Modified: branches/blender2.5/blender/source/blender/editors/transform/transform.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/transform/transform.c	2009-07-18 14:55:03 UTC (rev 21676)
+++ branches/blender2.5/blender/source/blender/editors/transform/transform.c	2009-07-18 15:02:12 UTC (rev 21677)
@@ -515,6 +515,9 @@
 
 	if (event->val) {
 		switch (event->type){
+		case RIGHTMOUSE:
+			t->state = TRANS_CANCEL;
+			break;
 		/* enforce redraw of transform when modifiers are used */
 		case LEFTCTRLKEY:
 		case RIGHTCTRLKEY:
@@ -814,9 +817,6 @@
 	}
 	else {
 		switch (event->type){
-		case RIGHTMOUSE:
-			t->state = TRANS_CANCEL;
-			break;
 		case LEFTMOUSE:
 			t->state = TRANS_CONFIRM;
 			break;