Merge branch 'blender2.7'
[blender.git] / intern / ghost / intern / GHOST_NDOFManagerCocoa.mm
index 3cce6bf520b0ce658df60f55904a8cc71c8c00a3..e6fbc96ae7af32909a0c2bcce823ef6f896c50b9 100644 (file)
@@ -200,8 +200,8 @@ static void DeviceEvent(uint32_t unused, uint32_t msg_type, void* msg_arg)
                                case kConnexionCmdHandleAxis:
                                {
                                        // convert to blender view coordinates
-                                       const short t[3] = {s->axis[0], -(s->axis[2]), s->axis[1]};
-                                       const short r[3] = {-(s->axis[3]), s->axis[5], -(s->axis[4])};
+                                       const int t[3] = {s->axis[0], -(s->axis[2]), s->axis[1]};
+                                       const int r[3] = {-(s->axis[3]), s->axis[5], -(s->axis[4])};
 
                                        ndof_manager->updateTranslation(t, now);
                                        ndof_manager->updateRotation(r, now);