diff options
| author | Julian Eisel <eiseljulian@gmail.com> | 2017-10-26 23:57:47 +0300 |
|---|---|---|
| committer | Julian Eisel <eiseljulian@gmail.com> | 2017-10-26 23:57:47 +0300 |
| commit | a3313315bab8c3a4b3e2865e4f27de17662f16cd (patch) | |
| tree | a8febf4b134c5dca242c36e56687dbd40cc0f3c5 /intern/ghost | |
| parent | 6e1fa2b0630562c76d249a5c78c5737163a542e3 (diff) | |
| parent | d245d360746b99abc4bc1c64907d6bd160be120e (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/ghost')
| -rw-r--r-- | intern/ghost/intern/GHOST_SystemCocoa.mm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/ghost/intern/GHOST_SystemCocoa.mm b/intern/ghost/intern/GHOST_SystemCocoa.mm index 42ccfb06fd9..b4fb788bca9 100644 --- a/intern/ghost/intern/GHOST_SystemCocoa.mm +++ b/intern/ghost/intern/GHOST_SystemCocoa.mm @@ -1470,7 +1470,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_kTrackpadEventRotate, x, y, - [event rotation] * 5.0, 0)); + [event rotation] * -5.0, 0)); } default: return GHOST_kFailure; |