Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMitchell Stokes <mogurijin@gmail.com>2010-05-30 01:22:24 +0400
committerMitchell Stokes <mogurijin@gmail.com>2010-05-30 01:22:24 +0400
commit9d3157eed000e7c543d04f5ad3efc5990675903b (patch)
tree54d3fcbc7a128ef0881385f49c57392c38bbd7e0 /source/blender/editors/space_view3d/view3d_edit.c
parente335321e884f270e2ad28a7b6c75eea7e11bf4b7 (diff)
Reversing the last merge because I botched it.
Diffstat (limited to 'source/blender/editors/space_view3d/view3d_edit.c')
-rw-r--r--source/blender/editors/space_view3d/view3d_edit.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c
index 5c2fe184d65..3d039f07a65 100644
--- a/source/blender/editors/space_view3d/view3d_edit.c
+++ b/source/blender/editors/space_view3d/view3d_edit.c
@@ -1157,8 +1157,8 @@ static int viewzoom_invoke(bContext *C, wmOperator *op, wmEvent *event)
else {
/* Set y move = x move as MOUSEZOOM uses only x axis to pass magnification value */
- vod->origy = vod->oldy = vod->origy + event->x - event->prevx;
- viewzoom_apply(vod, event->prevx, event->prevy, USER_ZOOM_DOLLY);
+ vod->origy = vod->oldy = event->x;
+ viewzoom_apply(vod, event->x, event->prevx, USER_ZOOM_DOLLY);
}
request_depth_update(CTX_wm_region_view3d(C));