svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r17236:HEAD

source/gameengine/Ketsji/KX_PythonInit.cpp

@@ -1461,16 +1461,21 @@ PyObject* initMathutils()
 	return Mathutils_Init("Mathutils"); // Use as a top level module in BGE
 }
 
-void PHY_SetActiveScene(class KX_Scene* scene)
+void KX_SetActiveScene(class KX_Scene* scene)
 {
 	gp_KetsjiScene = scene;
 }
 
-class KX_Scene* PHY_GetActiveScene()
+class KX_Scene* KX_GetActiveScene()
 {
 	return gp_KetsjiScene;
 }
 
+class KX_KetsjiEngine* KX_GetActiveEngine()
+{
+	return gp_KetsjiEngine;
+}
+
 // utility function for loading and saving the globalDict
 int saveGamePythonConfig( char **marshal_buffer)
 {