forked from bartvdbraak/blender
quiet some warnings for gcc 4.7
This commit is contained in:
parent
abf551b1a5
commit
83e83e5eff
@ -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
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user