[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53424] trunk/blender/intern/ghost/intern/ GHOST_SystemCocoa.mm: Revert change from Jens, wrong pointer check in the code.

[Ton Roosendaal]

Revision: 53424
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53424
Author:   ton
Date:     2012-12-30 10:38:56 +0000 (Sun, 30 Dec 2012)
Log Message:
-----------
Revert change from Jens, wrong pointer check in the code.

That change made all scrollwheel events be handled as if it was a swipe gesture.
Old style mouse wheel didn't work anymore.

This version should work for everyone, but we need more mac testers :)

Modified Paths:
--------------
    trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm

Modified: trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm	2012-12-30 10:37:32 UTC (rev 53423)
+++ trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm	2012-12-30 10:38:56 UTC (rev 53424)
@@ -1577,21 +1577,15 @@
 			}
 			break;
 			
-		case NSEventTypeBeginGesture:
-			m_hasMultiTouchTrackpad = true;
-			break;
-		case NSEventTypeEndGesture:
-			m_hasMultiTouchTrackpad = false;
-			break;
-			
 		case NSScrollWheel:
 			{
 				int momentum = 0;
 #if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
-				momentum = [event momentumPhase];
+				m_hasMultiTouchTrackpad = 0;
+				momentum = [event momentumPhase] || [event phase];
 #endif
-				/* standard scrollwheel case, NULL check address !!! of momentum */
-				if (!m_hasMultiTouchTrackpad && &momentum == NULL) {
+				/* standard scrollwheel case */
+				if (!m_hasMultiTouchTrackpad && momentum == 0) {
 					GHOST_TInt32 delta;
 					
 					double deltaF = [event deltaY];