Revision: 19349
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19349
Author: campbellbarton
Date: 2009-03-21 17:03:26 +0100 (Sat, 21 Mar 2009)
Log Message:
-----------
get rid of warnings, fix for a refcount error
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/python/intern/bpy_interface.c
branches/blender2.5/blender/source/blender/python/intern/bpy_operator.c
branches/blender2.5/blender/source/blender/python/intern/bpy_opwrapper.h
branches/blender2.5/blender/source/blender/python/intern/bpy_rna.c
branches/blender2.5/blender/source/blender/python/intern/bpy_util.c
branches/blender2.5/blender/source/blender/python/intern/bpy_util.h
Modified:
branches/blender2.5/blender/source/blender/python/intern/bpy_interface.c
===================================================================
--- branches/blender2.5/blender/source/blender/python/intern/bpy_interface.c
2009-03-21 12:09:58 UTC (rev 19348)
+++ branches/blender2.5/blender/source/blender/python/intern/bpy_interface.c
2009-03-21 16:03:26 UTC (rev 19349)
@@ -62,13 +62,13 @@
{
PyMethodDef *ml;
static PyMethodDef bpy_prop_meths[] = {
- {"FloatProperty", BPy_FloatProperty,
METH_VARARGS|METH_KEYWORDS, ""},
- {"IntProperty", BPy_IntProperty,
METH_VARARGS|METH_KEYWORDS, ""},
- {"BoolProperty", BPy_BoolProperty,
METH_VARARGS|METH_KEYWORDS, ""},
+ {"FloatProperty", (PyCFunction)BPy_FloatProperty,
METH_VARARGS|METH_KEYWORDS, ""},
+ {"IntProperty", (PyCFunction)BPy_IntProperty,
METH_VARARGS|METH_KEYWORDS, ""},
+ {"BoolProperty", (PyCFunction)BPy_BoolProperty,
METH_VARARGS|METH_KEYWORDS, ""},
{NULL, NULL, 0, NULL}
};
- for(ml = &bpy_prop_meths; ml->ml_name; ml++) {
+ for(ml = bpy_prop_meths; ml->ml_name; ml++) {
PyDict_SetItemString( dict, ml->ml_name,
PyCFunction_New(ml, NULL));
}
}
Modified:
branches/blender2.5/blender/source/blender/python/intern/bpy_operator.c
===================================================================
--- branches/blender2.5/blender/source/blender/python/intern/bpy_operator.c
2009-03-21 12:09:58 UTC (rev 19348)
+++ branches/blender2.5/blender/source/blender/python/intern/bpy_operator.c
2009-03-21 16:03:26 UTC (rev 19349)
@@ -192,7 +192,7 @@
}
static PyMethodDef pyop_base_call_meth[] = {
- {"__op_call__", pyop_base_call, METH_VARARGS|METH_KEYWORDS, "generic
operator calling function"}
+ {"__op_call__", (PyCFunction)pyop_base_call,
METH_VARARGS|METH_KEYWORDS, "generic operator calling function"}
};
@@ -252,10 +252,10 @@
pyrna= (BPy_StructRNA *)pyrna_struct_CreatePyObject(&ptr); /*
were not really using &ptr, overwite next */
//pyrna->freeptr= 1;
- return pyrna;
+ return (PyObject *)pyrna;
}
else {
- PyErr_SetString(PyExc_AttributeError, "Operator not found");
+ PyErr_Format(PyExc_AttributeError, "Operator \"%s\" not found",
name);
return NULL;
}
}
@@ -277,5 +277,3 @@
return (PyObject *)PyObject_NEW( BPy_OperatorBase, &pyop_base_Type );
}
-
-
Modified:
branches/blender2.5/blender/source/blender/python/intern/bpy_opwrapper.h
===================================================================
--- branches/blender2.5/blender/source/blender/python/intern/bpy_opwrapper.h
2009-03-21 12:09:58 UTC (rev 19348)
+++ branches/blender2.5/blender/source/blender/python/intern/bpy_opwrapper.h
2009-03-21 16:03:26 UTC (rev 19349)
@@ -32,10 +32,3 @@
PyObject *PYOP_wrap_remove(PyObject *self, PyObject *args);
#endif
-
-
-
-
-
-
-
Modified: branches/blender2.5/blender/source/blender/python/intern/bpy_rna.c
===================================================================
--- branches/blender2.5/blender/source/blender/python/intern/bpy_rna.c
2009-03-21 12:09:58 UTC (rev 19348)
+++ branches/blender2.5/blender/source/blender/python/intern/bpy_rna.c
2009-03-21 16:03:26 UTC (rev 19349)
@@ -1067,7 +1067,7 @@
if (ptr->type==NULL) {
newclass= NULL; /* Nothing to do */
- } else if ((newclass= BPy_RNA_PYTYPE(ptr->data))) {
+ } else if ((newclass= (PyObject *)BPy_RNA_PYTYPE(ptr->data))) {
Py_INCREF(newclass);
} else if ((nameprop = RNA_struct_name_property(ptr))) {
/* for now, return the base RNA type rather then a real module
*/
@@ -1142,7 +1142,7 @@
}
if (ptr->type == &RNA_Struct) { /* always return a python subtype from
rna struct types */
- PyTypeObject *tp = pyrna_struct_Subtype(ptr);
+ PyTypeObject *tp = (PyTypeObject *)pyrna_struct_Subtype(ptr);
if (tp) {
pyrna = (BPy_StructRNA *) tp->tp_alloc(tp, 0);
Modified: branches/blender2.5/blender/source/blender/python/intern/bpy_util.c
===================================================================
--- branches/blender2.5/blender/source/blender/python/intern/bpy_util.c
2009-03-21 12:09:58 UTC (rev 19348)
+++ branches/blender2.5/blender/source/blender/python/intern/bpy_util.c
2009-03-21 16:03:26 UTC (rev 19349)
@@ -212,6 +212,8 @@
*lineno = (int)PyLong_AsSsize_t(f_lineno);
Py_DECREF(f_lineno);
}
+
+ Py_DECREF(frame);
}
/* Would be nice if python had this built in */
Modified: branches/blender2.5/blender/source/blender/python/intern/bpy_util.h
===================================================================
--- branches/blender2.5/blender/source/blender/python/intern/bpy_util.h
2009-03-21 12:09:58 UTC (rev 19348)
+++ branches/blender2.5/blender/source/blender/python/intern/bpy_util.h
2009-03-21 16:03:26 UTC (rev 19349)
@@ -24,6 +24,9 @@
#include <Python.h>
+#ifndef BPY_UTIL_H
+#define BPY_UTIL_H
+
#include "bpy_compat.h"
/* for internal use only, so python can interchange a sequence of strings with
flags */
@@ -42,3 +45,5 @@
/* own python like utility function */
PyObject *PyObject_GetAttrStringArgs(PyObject *o, Py_ssize_t n, ...);
+
+#endif
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
