archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

- fix error in last commit

Browse Source 
- added better error feedback when registering operators fails.
- added some python benchmark timers (prints on exit), times number of times py scripts run, average time and total % of time running py scripts.
This commit is contained in:
Campbell Barton
2009-08-09 13:20:12 +00:00
parent 21302619f8
commit 2a408c864f
3 changed files with 58 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2642,7 +2642,7 @@ PyObject *BPy_FloatProperty(PyObject *self, PyObject *args, PyObject *kw)
return NULL;
}
if(PyCObject_Check(self) || PyType_Check(self) == 0) {
if(((self && (PyCObject_Check(self))) || (self && BPy_StructRNA_Check(self))) == 0) {
PyObject *ret = PyTuple_New(2);
PyTuple_SET_ITEM(ret, 0, PyCObject_FromVoidPtr((void *)BPy_FloatProperty, NULL));
PyTuple_SET_ITEM(ret, 1, kw);
@@ -2675,7 +2675,7 @@ PyObject *BPy_IntProperty(PyObject *self, PyObject *args, PyObject *kw)
return NULL;
}
if(PyCObject_Check(self) || PyType_Check(self) == 0) {
if(((self && (PyCObject_Check(self))) || (self && BPy_StructRNA_Check(self))) == 0) {
PyObject *ret = PyTuple_New(2);
PyTuple_SET_ITEM(ret, 0, PyCObject_FromVoidPtr((void *)BPy_IntProperty, NULL));
PyTuple_SET_ITEM(ret, 1, kw);
@@ -2708,7 +2708,7 @@ PyObject *BPy_BoolProperty(PyObject *self, PyObject *args, PyObject *kw)
return NULL;
}
if(PyCObject_Check(self) || PyType_Check(self) == 0) {
if(((self && (PyCObject_Check(self))) || (self && BPy_StructRNA_Check(self))) == 0) {
PyObject *ret = PyTuple_New(2);
PyTuple_SET_ITEM(ret, 0, PyCObject_FromVoidPtr((void *)BPy_BoolProperty, NULL));
PyTuple_SET_ITEM(ret, 1, kw);
@@ -2741,9 +2741,9 @@ PyObject *BPy_StringProperty(PyObject *self, PyObject *args, PyObject *kw)
return NULL;
}
if(PyCObject_Check(self) || PyType_Check(self) == 0) {
if(((self && (PyCObject_Check(self))) || (self && BPy_StructRNA_Check(self))) == 0) {
PyObject *ret = PyTuple_New(2);
PyTuple_SET_ITEM(ret, 0, PyCObject_FromVoidPtr((void *)BPy_BoolProperty, NULL));
PyTuple_SET_ITEM(ret, 0, PyCObject_FromVoidPtr((void *)BPy_StringProperty, NULL));
PyTuple_SET_ITEM(ret, 1, kw);
Py_INCREF(kw);
return ret;