diff options
| author | Yevgeny Makarov <jenkm> | 2020-10-29 02:40:28 +0300 |
|---|---|---|
| committer | Harley Acheson <harley.acheson@gmail.com> | 2020-10-29 02:40:28 +0300 |
| commit | cac8a7cddb56a654145ed1c9db2add8abff12704 (patch) | |
| tree | 456009c0f02a5e1e99bde9cbdbebb403366ad524 /source/blender/editors/interface/view2d_ops.c | |
| parent | b0a9a04f620120fd6b80ec985676f1a706a8495d (diff) | |
Fix for T65714: Pinch Zooming Crash using Mac Trackpad
Ensure that Zoom does not crash on Mac Trackpad by checking for existence of Continuous Zoom timer.
Differential Revision: https://developer.blender.org/D8682
Reviewed by Julian Eisel
Diffstat (limited to 'source/blender/editors/interface/view2d_ops.c')
| -rw-r--r-- | source/blender/editors/interface/view2d_ops.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/editors/interface/view2d_ops.c b/source/blender/editors/interface/view2d_ops.c index e4a7ad0d635..66194cf8783 100644 --- a/source/blender/editors/interface/view2d_ops.c +++ b/source/blender/editors/interface/view2d_ops.c @@ -1121,8 +1121,9 @@ static void view_zoomdrag_apply(bContext *C, wmOperator *op) dy *= -1; } - /* continuous zoom shouldn't move that fast... */ - if (U.viewzoom == USER_ZOOM_CONT) { /* XXX store this setting as RNA prop? */ + /* Check if the 'timer' is initialized, as zooming with the trackpad + * never uses the "Continuous" zoom method, and the 'timer' is not initialized. */ + if ((U.viewzoom == USER_ZOOM_CONT) && vzd->timer) { /* XXX store this setting as RNA prop? */ const double time = PIL_check_seconds_timer(); const float time_step = (float)(time - vzd->timer_lastdraw); |