[Bf-blender-cvs] [c87b7fdd8a5] blender-v2.91-release: Fix for T65714: Pinch Zooming Crash using Mac Trackpad

[Yevgeny Makarov]

Commit: c87b7fdd8a5069256b65d9dbea83b5d4e3b5c036
Author: Yevgeny Makarov
Date:   Fri Nov 6 17:43:11 2020 -0800
Branches: blender-v2.91-release
https://developer.blender.org/rBc87b7fdd8a5069256b65d9dbea83b5d4e3b5c036

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

===================================================================

M	source/blender/editors/interface/view2d_ops.c

===================================================================

diff --git a/source/blender/editors/interface/view2d_ops.c b/source/blender/editors/interface/view2d_ops.c
index d8ebbbca023..de57e7fc608 100644
--- a/source/blender/editors/interface/view2d_ops.c
+++ b/source/blender/editors/interface/view2d_ops.c
@@ -1122,8 +1122,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);