[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28036] trunk/blender/source/blender/ editors/screen/screen_ops.c: Fix [#21194] Swap regions stopped working

[Matt Ebb]

Revision: 28036
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28036
Author:   broken
Date:     2010-04-06 10:11:37 +0200 (Tue, 06 Apr 2010)

Log Message:
-----------
Fix [#21194] Swap regions stopped working

Cleaned up a code mismatch that I think got there by accident before.
Now area swap is assigned to Ctrl LMB drag to prevent any 'emulate mmb' conflicts.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/screen/screen_ops.c

Modified: trunk/blender/source/blender/editors/screen/screen_ops.c
===================================================================
--- trunk/blender/source/blender/editors/screen/screen_ops.c	2010-04-06 07:49:10 UTC (rev 28035)
+++ trunk/blender/source/blender/editors/screen/screen_ops.c	2010-04-06 08:11:37 UTC (rev 28036)
@@ -573,6 +573,7 @@
 
 static void area_swap_exit(bContext *C, wmOperator *op)
 {
+	WM_cursor_restore(CTX_wm_window(C));
 	if(op->customdata)
 		MEM_freeN(op->customdata);
 	op->customdata= NULL;
@@ -2959,7 +2960,7 @@
 	
 	RNA_int_set(WM_keymap_add_item(keymap, "SCREEN_OT_actionzone", LEFTMOUSE, KM_PRESS, 0, 0)->ptr, "modifier", 0);
 	RNA_int_set(WM_keymap_add_item(keymap, "SCREEN_OT_actionzone", LEFTMOUSE, KM_PRESS, KM_SHIFT, 0)->ptr, "modifier", 1);
-	RNA_int_set(WM_keymap_add_item(keymap, "SCREEN_OT_actionzone", LEFTMOUSE, KM_PRESS, KM_ALT, 0)->ptr, "modifier", 2);
+	RNA_int_set(WM_keymap_add_item(keymap, "SCREEN_OT_actionzone", LEFTMOUSE, KM_PRESS, KM_CTRL, 0)->ptr, "modifier", 2);
 	
 	/* screen tools */
 	WM_keymap_verify_item(keymap, "SCREEN_OT_area_split", EVT_ACTIONZONE_AREA, 0, 0, 0);