Port Python updates from Tuhopuu2:

getType/setType to action/sound actuator (sgefant)
Use a more generic python -> math conversion.

1 files changed, 8 insertions, 3 deletions

diff --git a/source/gameengine/Ketsji/KX_SceneActuator.cpp b/source/gameengine/Ketsji/KX_SceneActuator.cpp
index 721d01a3da3..9ccb4068cc0 100644
--- a/source/gameengine/Ketsji/KX_SceneActuator.cpp
+++ b/source/gameengine/Ketsji/KX_SceneActuator.cpp
@@ -314,16 +314,21 @@ PyObject* KX_SceneActuator::PySetCamera(PyObject* self,
 										PyObject* args, 
 										PyObject* kwds)
 {
+	PyObject *cam;
+	if (PyArg_ParseTuple(args, "O!", &KX_Camera::Type, &cam))
+	{
+		m_camera = (KX_Camera*) cam;
+		Py_Return;
+	}
+
 	/* one argument: a scene, ignore the rest */
 	char *camName;
-	KX_Camera *camOb;
-
 	if(!PyArg_ParseTuple(args, "s", &camName))
 	{
 		return NULL;
 	}
 
-	camOb = FindCamera(camName);
+	KX_Camera *camOb = FindCamera(camName);
 	if (camOb) m_camera = camOb;
 
 	Py_Return;