diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-11-25 13:52:05 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-11-25 13:52:05 +0400 |
commit | ea7d9a2a5d56bc007baaeb8c72349d694c106644 (patch) | |
tree | e7cfaeee221a4c8b7df9f718d598ac1106f62cf6 /source/blender/editors | |
parent | abc059f99aa8f5ad9a959e25262b561c54a7b209 (diff) |
continuous zoom was inverted from other zoom modes.
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/space_view3d/view3d_edit.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c index c7ba3378073..0d8567b256d 100644 --- a/source/blender/editors/space_view3d/view3d_edit.c +++ b/source/blender/editors/space_view3d/view3d_edit.c @@ -1653,7 +1653,7 @@ static void view_zoom_mouseloc(ARegion *ar, float dfac, int mx, int my) } -static void viewzoom_apply(ViewOpsData *vod, int x, int y, const short viewzoom, const short zoom_invert) +static void viewzoom_apply(ViewOpsData *vod, const int x, const int y, const short viewzoom, const short zoom_invert) { float zfac = 1.0; short use_cam_zoom; @@ -1674,10 +1674,10 @@ static void viewzoom_apply(ViewOpsData *vod, int x, int y, const short viewzoom, float fac; if (U.uiflag & USER_ZOOM_HORIZ) { - fac = (float)(x - vod->origx); + fac = (float)(vod->origx - x); } else { - fac = (float)(y - vod->origy); + fac = (float)(vod->origy - y); } if (zoom_invert) { |