Commit: 6451c072cef853cbdbd9db1b149463f959fb6d47
Author: Brecht Van Lommel
Date: Sat Jan 30 22:33:20 2016 +0100
Branches: master
https://developer.blender.org/rB6451c072cef853cbdbd9db1b149463f959fb6d47
Fix T47153: scroll wheel zoom fails with mouses that support smooth scroll on
OS X.
===================================================================
M intern/ghost/intern/GHOST_SystemCocoa.mm
===================================================================
diff --git a/intern/ghost/intern/GHOST_SystemCocoa.mm
b/intern/ghost/intern/GHOST_SystemCocoa.mm
index 80559fe..90f4557 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
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
