diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-10-09 13:38:05 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-10-09 13:38:05 +0400 |
| commit | 58e8d0b57e5559567751bc4c25eaad7bd9919a8f (patch) | |
| tree | cd238162e128dc4eeed145240763548f4a51e1c2 /source/blender | |
| parent | 9e0dd178134a973b9091705fd62f12ed9ea6434c (diff) | |
OSX zoom pinch was using inverted direction
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/editors/interface/view2d_ops.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/source/blender/editors/interface/view2d_ops.c b/source/blender/editors/interface/view2d_ops.c index eb2f6c62351..2c8db53b534 100644 --- a/source/blender/editors/interface/view2d_ops.c +++ b/source/blender/editors/interface/view2d_ops.c @@ -941,10 +941,15 @@ static int view_zoomdrag_invoke(bContext *C, wmOperator *op, wmEvent *event) /* As we have only 1D information (magnify value), feed both axes * with magnify information that is stored in x axis */ - fac = 0.01f * (event->x - event->prevx); + fac = 0.01f * (event->prevx - event->x); dx = fac * BLI_rctf_size_x(&v2d->cur) / 10.0f; dy = fac * BLI_rctf_size_y(&v2d->cur) / 10.0f; + if (U.uiflag & USER_ZOOM_INVERT) { + dx *= -1; + dy *= -1; + } + RNA_float_set(op->ptr, "deltax", dx); RNA_float_set(op->ptr, "deltay", dy); |