forked from bartvdbraak/blender
* explicit cast needed for mingw.
This commit is contained in:
parent
ddb46e12f9
commit
ebfc93de21
@ -112,13 +112,13 @@ typedef struct PyObjectPlus_Proxy {
|
||||
static PyAttributeDef Attributes[]; \
|
||||
virtual PyTypeObject *GetType(void) {return &Type;}; \
|
||||
virtual PyObject *GetProxy() {return GetProxy_Ext(this, &Type);}; \
|
||||
virtual PyObject *NewProxy(bool py_owns) {return NewProxy_Ext(this, &Type, py_owns);}; \
|
||||
virtual PyObject *NewProxy(bool py_owns) {return NewProxy_Ext(this, &Type, py_owns);};
|
||||
|
||||
|
||||
#ifdef WITH_CXX_GUARDEDALLOC
|
||||
#define Py_Header __Py_Header \
|
||||
void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, Type.tp_name); } \
|
||||
void operator delete( void *mem ) { MEM_freeN(mem); } \
|
||||
void operator delete( void *mem ) { MEM_freeN(mem); }
|
||||
|
||||
#else
|
||||
#define Py_Header __Py_Header
|
||||
|
@ -157,7 +157,7 @@ bool PyVecTo(PyObject* pyval, T& vec)
|
||||
|
||||
return true;
|
||||
}
|
||||
else if (PyObject_TypeCheck(pyval, &PyObjectPlus::Type))
|
||||
else if (PyObject_TypeCheck(pyval, (PyTypeObject *)&PyObjectPlus::Type))
|
||||
{ /* note, include this check because PySequence_Check does too much introspection
|
||||
* on the PyObject (like getting its __class__, on a BGE type this means searching up
|
||||
* the parent list each time only to discover its not a sequence.
|
||||
|
Loading…
Reference in New Issue
Block a user