diff options
Diffstat (limited to 'source/gameengine/Expressions/PyObjectPlus.h')
-rw-r--r-- | source/gameengine/Expressions/PyObjectPlus.h | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/source/gameengine/Expressions/PyObjectPlus.h b/source/gameengine/Expressions/PyObjectPlus.h index 786ca1fdc4f..42168461634 100644 --- a/source/gameengine/Expressions/PyObjectPlus.h +++ b/source/gameengine/Expressions/PyObjectPlus.h @@ -404,9 +404,9 @@ public: // }; // decref method virtual PyObject *py_getattro(PyObject *attr); // py_getattro method - static PyObject *py_base_getattro(PyObject * PyObj, PyObject *attr) // This should be the entry in Type. + static PyObject *py_base_getattro(PyObject * self, PyObject *attr) // This should be the entry in Type. { - return ((PyObjectPlus*) PyObj)->py_getattro(attr); + return ((PyObjectPlus*) self)->py_getattro(attr); } static PyObject* py_get_attrdef(void *self, const PyAttributeDef *attrdef); @@ -419,13 +419,12 @@ public: virtual int py_delattro(PyObject *attr); virtual int py_setattro(PyObject *attr, PyObject *value); // py_setattro method - static int py_base_setattro(PyObject *PyObj, // This should be the entry in Type. - PyObject *attr, - PyObject *value) - { + static int py_base_setattro(PyObject *self, PyObject *attr, PyObject *value) // the PyType should reference this + { if (value==NULL) - return ((PyObjectPlus*) PyObj)->py_delattro(attr); - return ((PyObjectPlus*) PyObj)->py_setattro(attr, value); + return ((PyObjectPlus*) self)->py_delattro(attr); + + return ((PyObjectPlus*) self)->py_setattro(attr, value); } virtual PyObject *py_repr(void); // py_repr method |