Merge branch 'master' into blender2.8
[blender.git] / intern / ghost / intern / GHOST_WindowCocoa.mm
index b0feb11a6afc079a1076cf40542043891d169d25..a018bbe15c6e417d7de7b1220c9baeb4faaf00f1 100644 (file)
@@ -1311,9 +1311,6 @@ GHOST_TSuccess GHOST_WindowCocoa::setWindowCursorGrab(GHOST_TGrabCursorMode mode
                        //Make window key if it wasn't to get the mouse move events
                        [m_window makeKeyWindow];
                        
-                       //Dissociate cursor position even for warp mode, to allow mouse acceleration to work even when warping the cursor
-                       err = CGAssociateMouseAndMouseCursorPosition(false) == kCGErrorSuccess ? GHOST_kSuccess : GHOST_kFailure;
-                       
                        [pool drain];
                }
        }
@@ -1323,7 +1320,6 @@ GHOST_TSuccess GHOST_WindowCocoa::setWindowCursorGrab(GHOST_TGrabCursorMode mode
                        setWindowCursorVisibility(true);
                }
                
-               err = CGAssociateMouseAndMouseCursorPosition(true) == kCGErrorSuccess ? GHOST_kSuccess : GHOST_kFailure;
                /* Almost works without but important otherwise the mouse GHOST location can be incorrect on exit */
                setCursorGrabAccum(0, 0);
                m_cursorGrabBounds.m_l= m_cursorGrabBounds.m_r= -1; /* disable */