diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-11-01 06:01:09 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-01 06:01:09 +0400 |
| commit | e08c4a00d230d3a09a8f3ab25256100113db36b7 (patch) | |
| tree | 3edb6f5efc008c3f8f623d430a9884846651115b /intern | |
| parent | 1a2188af41b272506e3b58129f178db2172d053f (diff) | |
| parent | a5959e767e1fce78fa1876e8791667a377ac51f1 (diff) | |
svn merge -r41371:41420 ^/trunk/blender
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/ghost/intern/GHOST_SystemCocoa.mm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/ghost/intern/GHOST_SystemCocoa.mm b/intern/ghost/intern/GHOST_SystemCocoa.mm index 7a6c0a02043..9dc3dd3f30b 100644 --- a/intern/ghost/intern/GHOST_SystemCocoa.mm +++ b/intern/ghost/intern/GHOST_SystemCocoa.mm @@ -578,7 +578,7 @@ GHOST_SystemCocoa::GHOST_SystemCocoa() if (strstr(rstring,"MacBookAir") || (strstr(rstring,"MacBook") && (rstring[strlen(rstring)-3]>='5') && (rstring[strlen(rstring)-3]<='9'))) m_hasMultiTouchTrackpad = true; - else m_hasMultiTouchTrackpad = true; + else m_hasMultiTouchTrackpad = true; // experimental, changes only MagicMouse behaviour (zoom->pan) but enables MagicTrackpad for all Macs free( rstring ); rstring = NULL; @@ -1610,7 +1610,7 @@ GHOST_TSuccess GHOST_SystemCocoa::handleMouseEvent(void *eventPtr) GHOST_TInt32 x, y; window->clientToScreenIntern(mousePos.x, mousePos.y, x, y); pushEvent(new GHOST_EventTrackpad([event timestamp]*1000, window, GHOST_kTrackpadEventMagnify, x, y, - [event magnification]*250.0 + 0.1, 0)); + [event magnification]*125.0 + 0.1, 0)); } break; |