diff options
Diffstat (limited to 'source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp')
-rw-r--r-- | source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp b/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp index 37d772b9674..cfa0ad4a986 100644 --- a/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp +++ b/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp @@ -192,16 +192,22 @@ PyObject* KX_SCA_AddObjectActuator::PySetObject(PyObject* self, PyObject* args, PyObject* kwds) { - char* objectname; - - if (!PyArg_ParseTuple(args, "s", &objectname)) - return NULL; - - CValue* gameobj = SCA_ILogicBrick::m_sCurrentLogicManager->GetGameObjectByName(STR_String(objectname)); + PyObject* gameobj; + if (PyArg_ParseTuple(args, "O!", &KX_GameObject::Type, &gameobj)) + { + m_OriginalObject = (CValue*)gameobj; + Py_Return; + } - m_OriginalObject= (CValue*)gameobj; + char* objectname; + if (PyArg_ParseTuple(args, "s", &objectname)) + { + m_OriginalObject= (CValue*)SCA_ILogicBrick::m_sCurrentLogicManager->GetGameObjectByName(STR_String(objectname));; + + Py_Return; + } - Py_Return; + return NULL; } |