diff options
| author | Matt Ebb <matt@mke3.net> | 2010-04-06 12:11:37 +0400 |
|---|---|---|
| committer | Matt Ebb <matt@mke3.net> | 2010-04-06 12:11:37 +0400 |
| commit | 9efc0dd71d0212e6006cc07f9a8ed936a68a19f2 (patch) | |
| tree | 1800ccfcb47d190501b783a045a6f23b1455d3c1 /source/blender/editors/screen/screen_ops.c | |
| parent | bad41fcff50f599dd1e9a6595a365d6d796df584 (diff) | |
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.
Diffstat (limited to 'source/blender/editors/screen/screen_ops.c')
| -rw-r--r-- | source/blender/editors/screen/screen_ops.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c index e5feccefedc..53879a55c1f 100644 --- a/source/blender/editors/screen/screen_ops.c +++ b/source/blender/editors/screen/screen_ops.c @@ -573,6 +573,7 @@ static int area_swap_init(bContext *C, wmOperator *op, wmEvent *event) 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 @@ void ED_keymap_screen(wmKeyConfig *keyconf) 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); |