diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2016-01-31 00:33:20 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2016-01-31 00:33:20 +0300 |
| commit | 6451c072cef853cbdbd9db1b149463f959fb6d47 (patch) | |
| tree | 8d46030cea372a12eb4ef4bf08168ba5cc11ddb8 /intern/ghost | |
| parent | fe0ca82b232dcab29030c4a20b8bd1b033d1d346 (diff) | |
Fix T47153: scroll wheel zoom fails with mouses that support smooth scroll on OS X.
Diffstat (limited to 'intern/ghost')
| -rw-r--r-- | intern/ghost/intern/GHOST_SystemCocoa.mm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/ghost/intern/GHOST_SystemCocoa.mm b/intern/ghost/intern/GHOST_SystemCocoa.mm index 80559fe53f8..90f4557ad3a 100644 --- a/intern/ghost/intern/GHOST_SystemCocoa.mm +++ b/intern/ghost/intern/GHOST_SystemCocoa.mm @@ -1399,7 +1399,7 @@ GHOST_TSuccess GHOST_SystemCocoa::handleMouseEvent(void *eventPtr) if ([event respondsToSelector:@selector(phase)]) phase = [event phase]; if ([event respondsToSelector:@selector(hasPreciseScrollingDeltas)]) - hasMultiTouch = [event hasPreciseScrollingDeltas]; + hasMultiTouch = [event hasPreciseScrollingDeltas] && [event subtype] != NSMouseEventSubtype; /* when pressing a key while momentum scrolling continues after * lifting fingers off the trackpad, the action can unexpectedly |