diff options
| -rw-r--r-- | intern/ghost/intern/GHOST_DisplayManager.cpp | 7 | ||||
| -rw-r--r-- | source/gameengine/Expressions/PyObjectPlus.cpp | 3 | ||||
| -rw-r--r-- | source/gameengine/Ketsji/KX_PyMath.cpp | 12 |
3 files changed, 16 insertions, 6 deletions
diff --git a/intern/ghost/intern/GHOST_DisplayManager.cpp b/intern/ghost/intern/GHOST_DisplayManager.cpp index 8a86424e347..ca0d53b8297 100644 --- a/intern/ghost/intern/GHOST_DisplayManager.cpp +++ b/intern/ghost/intern/GHOST_DisplayManager.cpp @@ -149,7 +149,12 @@ GHOST_DisplayManager::findMatch( GHOST_TSuccess success = GHOST_kSuccess; GHOST_ASSERT(m_settingsInitialized, "GHOST_DisplayManager::findMatch(): m_settingsInitialized=false"); - int criteria[4] = { setting.xPixels, setting.yPixels, setting.bpp, setting.frequency }; + int criteria[4] = { + (int)setting.xPixels, + (int)setting.yPixels, + (int)setting.bpp, + (int)setting.frequency + }; int capabilities[4]; double field, score; double best = 1e12; // A big number diff --git a/source/gameengine/Expressions/PyObjectPlus.cpp b/source/gameengine/Expressions/PyObjectPlus.cpp index 38d622a7d45..5347aaafc65 100644 --- a/source/gameengine/Expressions/PyObjectPlus.cpp +++ b/source/gameengine/Expressions/PyObjectPlus.cpp @@ -456,7 +456,8 @@ PyObject *PyObjectPlus::py_get_attrdef(PyObject *self_py, const PyAttributeDef * { MT_Vector3 *val = reinterpret_cast<MT_Vector3*>(ptr); #ifdef USE_MATHUTILS - float fval[3]= {(*val)[0], (*val)[1], (*val)[2]}; + float fval[3]; + val->getValue(fval); return Vector_CreatePyObject(fval, 3, Py_NEW, NULL); #else PyObject* resultlist = PyList_New(3); diff --git a/source/gameengine/Ketsji/KX_PyMath.cpp b/source/gameengine/Ketsji/KX_PyMath.cpp index 9c5e043477c..f459b806d2f 100644 --- a/source/gameengine/Ketsji/KX_PyMath.cpp +++ b/source/gameengine/Ketsji/KX_PyMath.cpp @@ -146,7 +146,8 @@ PyObject* PyObjectFrom(const MT_Matrix3x3 &mat) PyObject* PyObjectFrom(const MT_Quaternion &qrot) { /* NOTE, were re-ordering here for Mathutils compat */ - float fvec[4]= {qrot[3], qrot[0], qrot[1], qrot[2]}; + float fvec[4]; + qrot.getValue(fvec); return Quaternion_CreatePyObject(fvec, Py_NEW, NULL); } #endif @@ -154,7 +155,8 @@ PyObject* PyObjectFrom(const MT_Quaternion &qrot) PyObject* PyObjectFrom(const MT_Tuple4 &vec) { #ifdef USE_MATHUTILS - float fvec[4]= {vec[0], vec[1], vec[2], vec[3]}; + float fvec[4]; + vec.getValue(fvec); return Vector_CreatePyObject(fvec, 4, Py_NEW, NULL); #else PyObject *list = PyList_New(4); @@ -169,7 +171,8 @@ PyObject* PyObjectFrom(const MT_Tuple4 &vec) PyObject* PyObjectFrom(const MT_Tuple3 &vec) { #ifdef USE_MATHUTILS - float fvec[3]= {vec[0], vec[1], vec[2]}; + float fvec[3]; + vec.getValue(fvec); return Vector_CreatePyObject(fvec, 3, Py_NEW, NULL); #else PyObject *list = PyList_New(3); @@ -183,7 +186,8 @@ PyObject* PyObjectFrom(const MT_Tuple3 &vec) PyObject* PyObjectFrom(const MT_Tuple2 &vec) { #ifdef USE_MATHUTILS - float fvec[2]= {vec[0], vec[1]}; + float fvec[2]; + vec.getValue(fvec); return Vector_CreatePyObject(fvec, 2, Py_NEW, NULL); #else PyObject *list = PyList_New(2); |