archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix for [#28978]

Browse Source 
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.
This commit is contained in:
Alexander Kuznetsov
2012-01-08 05:10:52 +00:00
parent fd889253e4
commit d6e0d0fd89
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/editors/interface/view2d_ops.c
View File

@@ -248,20 +248,19 @@ static int view_pan_modal(bContext *C, wmOperator *op, wmEvent *event)
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) {