[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45191] trunk/blender: quiet some warnings for gcc 4.7
Campbell Barton
ideasman42 at gmail.com
Mon Mar 26 22:49:34 CEST 2012
Revision: 45191
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45191
Author: campbellbarton
Date: 2012-03-26 20:49:33 +0000 (Mon, 26 Mar 2012)
Log Message:
-----------
quiet some warnings for gcc 4.7
Modified Paths:
--------------
trunk/blender/intern/ghost/intern/GHOST_DisplayManager.cpp
trunk/blender/source/gameengine/Expressions/PyObjectPlus.cpp
trunk/blender/source/gameengine/Ketsji/KX_PyMath.cpp
Modified: trunk/blender/intern/ghost/intern/GHOST_DisplayManager.cpp
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_DisplayManager.cpp 2012-03-26 20:41:54 UTC (rev 45190)
+++ trunk/blender/intern/ghost/intern/GHOST_DisplayManager.cpp 2012-03-26 20:49:33 UTC (rev 45191)
@@ -149,7 +149,12 @@
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
Modified: trunk/blender/source/gameengine/Expressions/PyObjectPlus.cpp
===================================================================
--- trunk/blender/source/gameengine/Expressions/PyObjectPlus.cpp 2012-03-26 20:41:54 UTC (rev 45190)
+++ trunk/blender/source/gameengine/Expressions/PyObjectPlus.cpp 2012-03-26 20:49:33 UTC (rev 45191)
@@ -456,7 +456,8 @@
{
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);
Modified: trunk/blender/source/gameengine/Ketsji/KX_PyMath.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_PyMath.cpp 2012-03-26 20:41:54 UTC (rev 45190)
+++ trunk/blender/source/gameengine/Ketsji/KX_PyMath.cpp 2012-03-26 20:49:33 UTC (rev 45191)
@@ -146,7 +146,8 @@
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_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_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_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);
More information about the Bf-blender-cvs
mailing list