Merged 15170:15635 from trunk (no conflicts or even merges)
[blender.git] / source / gameengine / GameLogic / SCA_ILogicBrick.cpp
index 8423d06dfcd3047f955c0f0fc13facb1f654ffab..f6efd485adbd00eae134eced2c5aad673c95df22 100644 (file)
@@ -242,8 +242,8 @@ PyParentObject SCA_ILogicBrick::Parents[] = {
 
 
 PyMethodDef SCA_ILogicBrick::Methods[] = {
-  {"getOwner", (PyCFunction) SCA_ILogicBrick::sPyGetOwner, METH_VARARGS},
-  {"getExecutePriority", (PyCFunction) SCA_ILogicBrick::sPySetExecutePriority, METH_VARARGS},
+  {"getOwner", (PyCFunction) SCA_ILogicBrick::sPyGetOwner, METH_NOARGS},
+  {"getExecutePriority", (PyCFunction) SCA_ILogicBrick::sPySetExecutePriority, METH_NOARGS},
   {"setExecutePriority", (PyCFunction) SCA_ILogicBrick::sPySetExecutePriority, METH_VARARGS},
   {NULL,NULL} //Sentinel
 };
@@ -258,9 +258,7 @@ SCA_ILogicBrick::_getattr(const STR_String& attr)
 
 
 
-PyObject* SCA_ILogicBrick::PyGetOwner(PyObject* self, 
-                              PyObject* args, 
-                              PyObject* kwds)
+PyObject* SCA_ILogicBrick::PyGetOwner(PyObject* self)
 {
        CValue* parent = GetParent();
        if (parent)
@@ -294,9 +292,7 @@ PyObject* SCA_ILogicBrick::PySetExecutePriority(PyObject* self,
 
 
 
-PyObject* SCA_ILogicBrick::PyGetExecutePriority(PyObject* self, 
-                              PyObject* args, 
-                              PyObject* kwds)
+PyObject* SCA_ILogicBrick::PyGetExecutePriority(PyObject* self)
 {
        return PyInt_FromLong(m_Execute_Ueber_Priority);
 }