1 files changed, 14 insertions, 7 deletions
diff --git a/source/gameengine/Ketsji/KX_TrackToActuator.cpp b/source/gameengine/Ketsji/KX_TrackToActuator.cpp
index c02cdbc17be..becc4c58758 100644
--- a/source/gameengine/Ketsji/KX_TrackToActuator.cpp
+++ b/source/gameengine/Ketsji/KX_TrackToActuator.cpp
@@ -399,16 +399,23 @@ char KX_TrackToActuator::SetObject_doc[] =
 "\t- object: string\n"
 "\tSet the object to track with the parent of this actuator.\n";
 PyObject* KX_TrackToActuator::PySetObject(PyObject* self, PyObject* args, PyObject* kwds) {
-	char* nameArg;
-	
-	if (!PyArg_ParseTuple(args, "s", &nameArg)) {
-		return NULL;		
+	PyObject* gameobj;
+	if (PyArg_ParseTuple(args, "O!", &KX_GameObject::Type, &gameobj))
+	{
+		m_object = (SCA_IObject*)gameobj;
+
+		Py_Return;
 	}
-	CValue* gameobj = SCA_ILogicBrick::m_sCurrentLogicManager->GetGameObjectByName(STR_String(nameArg));
 	
-	m_object= (SCA_IObject*)gameobj;
+	char* objectname;
+	if (PyArg_ParseTuple(args, "s", &objectname))
+	{
+		m_object= static_cast<SCA_IObject*>(SCA_ILogicBrick::m_sCurrentLogicManager->GetGameObjectByName(STR_String(objectname)));
+		
+		Py_Return;
+	}
 	
-	Py_Return;	
+	return NULL;
 }