diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-06-17 12:57:49 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-17 12:57:49 +0300 |
| commit | 43ce201125ff97e16a56b372a91442590498dacc (patch) | |
| tree | 10b6ef3c41cab5b9cef0b93d99de0a14fca4157f /source/blender/editors/interface/view2d_ops.c | |
| parent | 75188552a113f4dc226f21076f883ac3c11c9a98 (diff) | |
| parent | 42103a3eb8e9ee341c89310cc2343bc21b6ae7e2 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/interface/view2d_ops.c')
| -rw-r--r-- | source/blender/editors/interface/view2d_ops.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/interface/view2d_ops.c b/source/blender/editors/interface/view2d_ops.c index fbc8fe790c9..b9e6d43aa87 100644 --- a/source/blender/editors/interface/view2d_ops.c +++ b/source/blender/editors/interface/view2d_ops.c @@ -1123,7 +1123,7 @@ static int view_zoomdrag_modal(bContext *C, wmOperator *op, const wmEvent *event /* some view2d's (graph) don't have min/max zoom, or extreme ones */ if (v2d->maxzoom > 0.0f) - zoomfac = CLAMPIS(0.001f * v2d->maxzoom, 0.001f, 0.01f); + zoomfac = clamp_f(0.001f * v2d->maxzoom, 0.001f, 0.01f); /* x-axis transform */ fac = zoomfac * (event->x - vzd->lastx); |