griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix for T65714: Pinch Zooming Crash using Mac Trackpad

Browse Source 
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
This commit is contained in:
Yevgeny Makarov
2020-10-28 16:40:28 -07:00
committed by Harley Acheson
parent b0a9a04f62
commit cac8a7cddb
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/editors/interface/view2d_ops.c
View File

@@ -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);