1berry/blender
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix for mingw

Browse Source
This commit is contained in:
Campbell Barton 2011-10-01 15:02:55 +00:00
parent ca5871c26f
commit 7b398f271e
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
source/blender/python/intern/bpy_rna.c
View File

@ -4706,7 +4706,11 @@ PyTypeObject pyrna_struct_meta_idprop_Type= {
NULL, /* struct PyMethodDef *tp_methods; */ NULL, /* struct PyMethodDef *tp_methods; */
NULL, /* struct PyMemberDef *tp_members; */ NULL, /* struct PyMemberDef *tp_members; */
NULL, /* struct PyGetSetDef *tp_getset; */ NULL, /* struct PyGetSetDef *tp_getset; */
NULL, /* struct _typeobject *tp_base; */ #ifdef FREE_WINDOWS
NULL, /* defer assignment */
#else
&PyType_Type, /* struct _typeobject *tp_base; */
#endif
NULL, /* PyObject *tp_dict; */ NULL, /* PyObject *tp_dict; */
NULL, /* descrgetfunc tp_descr_get; */ NULL, /* descrgetfunc tp_descr_get; */
NULL, /* descrsetfunc tp_descr_set; */ NULL, /* descrsetfunc tp_descr_set; */
@ -5277,7 +5281,11 @@ PyTypeObject pyrna_prop_collection_iter_Type= {
NULL, /* reprfunc tp_str; */ NULL, /* reprfunc tp_str; */
/* will only use these if this is a subtype of a py class */ /* will only use these if this is a subtype of a py class */
#ifdef FREE_WINDOWS
NULL, /* defer assignment */
#else
PyObject_GenericGetAttr, /* getattrofunc tp_getattro; */ PyObject_GenericGetAttr, /* getattrofunc tp_getattro; */
#endif
NULL, /* setattrofunc tp_setattro; */ NULL, /* setattrofunc tp_setattro; */
/* Functions to access object as input/output buffer */ /* Functions to access object as input/output buffer */
@ -5306,7 +5314,11 @@ PyTypeObject pyrna_prop_collection_iter_Type= {
#endif #endif
/*** Added in release 2.2 ***/ /*** Added in release 2.2 ***/
/* Iterators */ /* Iterators */
#ifdef FREE_WINDOWS
NULL, /* defer assignment */
#else
PyObject_SelfIter, /* getiterfunc tp_iter; */ PyObject_SelfIter, /* getiterfunc tp_iter; */
#endif
(iternextfunc) pyrna_prop_collection_iter_next, /* iternextfunc tp_iternext; */ (iternextfunc) pyrna_prop_collection_iter_next, /* iternextfunc tp_iternext; */
/*** Attribute descriptor and subclassing stuff ***/ /*** Attribute descriptor and subclassing stuff ***/
@ -5692,8 +5704,15 @@ void BPY_rna_init(void)
mathutils_rna_matrix_cb_index= Mathutils_RegisterCallback(&mathutils_rna_matrix_cb); mathutils_rna_matrix_cb_index= Mathutils_RegisterCallback(&mathutils_rna_matrix_cb);
#endif #endif
/* metaclass */ /* for some reason MSVC complains of these */
#ifdef FREE_WINDOWS
pyrna_struct_meta_idprop_Type.tp_base= &PyType_Type; pyrna_struct_meta_idprop_Type.tp_base= &PyType_Type;
pyrna_prop_collection_iter_Type.tp_iter= PyObject_SelfIter;
pyrna_prop_collection_iter_Type.tp_getattro= PyObject_GenericGetAttr;
#endif
/* metaclass */
if(PyType_Ready(&pyrna_struct_meta_idprop_Type) < 0) if(PyType_Ready(&pyrna_struct_meta_idprop_Type) < 0)
return; return;