Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix a few compile errors with C++11 on macOS.

Browse Source
This commit is contained in:
Brecht Van Lommel
2016-09-14 11:41:20 +02:00
parent 0fe7446a30
commit 74e0f900c5
6 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
intern/ghost/intern/GHOST_SystemWin32.cpp
View File

@@ -879,12 +879,12 @@ bool GHOST_SystemWin32::processNDOF(RAWINPUT const &raw)
{
const short *axis = (short *)(data + 1);
// massage into blender view coords (same goes for rotation)
const short t[3] = {axis[0], -axis[2], axis[1]};
const int t[3] = {axis[0], -axis[2], axis[1]};
m_ndofManager->updateTranslation(t, now);
if (raw.data.hid.dwSizeHid == 13) {
// this report also includes rotation
const short r[3] = {-axis[3], axis[5], -axis[4]};
const int r[3] = {-axis[3], axis[5], -axis[4]};
m_ndofManager->updateRotation(r, now);
// I've never gotten one of these, has anyone else?
@@ -895,7 +895,7 @@ bool GHOST_SystemWin32::processNDOF(RAWINPUT const &raw)
case 2: // rotation
{
const short *axis = (short *)(data + 1);
const short r[3] = {-axis[0], axis[2], -axis[1]};
const int r[3] = {-axis[0], axis[2], -axis[1]};
m_ndofManager->updateRotation(r, now);
break;
}