Revision: 23461
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23461
Author: jesterking
Date: 2009-09-24 22:20:43 +0200 (Thu, 24 Sep 2009)
Log Message:
-----------
* explicit cast needed for mingw.
Modified Paths:
--------------
trunk/blender/source/gameengine/Expressions/PyObjectPlus.h
trunk/blender/source/gameengine/Ketsji/KX_PyMath.h
Modified: trunk/blender/source/gameengine/Expressions/PyObjectPlus.h
===================================================================
--- trunk/blender/source/gameengine/Expressions/PyObjectPlus.h 2009-09-24
19:52:32 UTC (rev 23460)
+++ trunk/blender/source/gameengine/Expressions/PyObjectPlus.h 2009-09-24
20:20:43 UTC (rev 23461)
@@ -112,13 +112,13 @@
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
Modified: trunk/blender/source/gameengine/Ketsji/KX_PyMath.h
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_PyMath.h 2009-09-24 19:52:32 UTC
(rev 23460)
+++ trunk/blender/source/gameengine/Ketsji/KX_PyMath.h 2009-09-24 20:20:43 UTC
(rev 23461)
@@ -157,7 +157,7 @@
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.
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
