[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43218] trunk/blender/source/blender/ editors/interface/view2d_ops.c: Fix for [#28978]

[Alexander Kuznetsov]

Revision: 43218
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43218
Author:   alexk
Date:     2012-01-08 05:10:52 +0000 (Sun, 08 Jan 2012)
Log Message:
-----------
Fix for [#28978]
Disabling mode switching in panning in 2d as it is disabled in 3d also.
Apparently, it is a not good idea to call modal method from a modal method as the last won't be canceled.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/interface/view2d_ops.c

Modified: trunk/blender/source/blender/editors/interface/view2d_ops.c
===================================================================
--- trunk/blender/source/blender/editors/interface/view2d_ops.c	2012-01-08 04:14:13 UTC (rev 43217)
+++ trunk/blender/source/blender/editors/interface/view2d_ops.c	2012-01-08 05:10:52 UTC (rev 43218)
@@ -248,20 +248,19 @@
 			view_pan_apply(op);
 		}
 			break;
-			
+		/* XXX - Mode switching isn't implemented. See comments in 36818.
+		 * switch to zoom *
 		case LEFTMOUSE:
-			/* switch to zoom */
 			if (event->val==KM_PRESS) {
-				/* calculate overall delta mouse-movement for redo */
+				* calculate overall delta mouse-movement for redo *
 				RNA_int_set(op->ptr, "deltax", (vpd->startx - vpd->lastx));
 				RNA_int_set(op->ptr, "deltay", (vpd->starty - vpd->lasty));
 				
 				view_pan_exit(op);
 				WM_cursor_restore(CTX_wm_window(C));
-				
 				WM_operator_name_call(C, "VIEW2D_OT_zoom", WM_OP_INVOKE_DEFAULT, NULL);
 				return OPERATOR_FINISHED;
-			}
+			}*/
 			
 		default:
 			if (event->type == vpd->invoke_event || event->type==ESCKEY) {