Hi Jens,
> + if (!m_hasMultiTouchTrackpad && &momentum == NULL) {
momentum is an int, declared a few lines above. Its address will always be not
NULL.
NSEventPhase is defined as an enum, of unsigned int.
-Ton-
------------------------------------------------------------------------
Ton Roosendaal Blender Foundation [email protected] www.blender.org
Blender Institute Entrepotdok 57A 1018AD Amsterdam The Netherlands
On 29 Dec, 2012, at 20:51, jens verwiebe wrote:
> Revision: 53412
>
> http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53412
> Author: jensverwiebe
> Date: 2012-12-29 19:51:44 +0000 (Sat, 29 Dec 2012)
> Log Message:
> -----------
> OSX: fix magic mouse swipes compiling on with MAC_OS_X_VERSION_MIN_REQUIRED
> by checking address not value
>
> 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-29
> 19:43:08 UTC (rev 53411)
> +++ trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm 2012-12-29
> 19:51:44 UTC (rev 53412)
> @@ -1590,8 +1590,8 @@
> #if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
> momentum = [event momentumPhase];
> #endif
> - /* standard scrollwheel case */
> - if (!m_hasMultiTouchTrackpad && momentum==0) {
> + /* standard scrollwheel case, NULL check
> address !!! of momentum */
> + if (!m_hasMultiTouchTrackpad && &momentum ==
> NULL) {
> GHOST_TInt32 delta;
>
> double deltaF = [event deltaY];
>
> _______________________________________________
> Bf-blender-cvs mailing list
> [email protected]
> http://lists.blender.org/mailman/listinfo/bf-blender-cvs
_______________________________________________
Bf-committers mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-committers
