Merged 15170:15635 from trunk (no conflicts or even merges)
[blender.git] / intern / ghost / intern / GHOST_SystemX11.cpp
index ff1bf51bbb52fa2fef2360abc98c33700e0a4de3..3003e0b8b1431a75c8adacb9664d41b4578c0f2a 100644 (file)
@@ -488,12 +488,12 @@ GHOST_SystemX11::processEvent(XEvent *xe)
                                        data.changed = 1;
                                        data.delta = xcme.data.s[8] - data.time;
                                        data.time = xcme.data.s[8];
-                                       data.tx = xcme.data.s[2];
-                                       data.ty = xcme.data.s[3];
-                                       data.tz = xcme.data.s[4];
+                                       data.tx = xcme.data.s[2] >> 2;
+                                       data.ty = xcme.data.s[3] >> 2;
+                                       data.tz = xcme.data.s[4] >> 2;
                                        data.rx = xcme.data.s[5];
                                        data.ry = xcme.data.s[6];
-                                       data.rz = xcme.data.s[7];
+                                       data.rz =-xcme.data.s[7];
                                        g_event = new GHOST_EventNDOF(getMilliSeconds(),
                                                                      GHOST_kEventNDOFMotion,
                                                                      window, data);