svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r22717:22875
[blender.git] / source / gameengine / Ketsji / KX_ISceneConverter.h
index 3709fa8c784e2f50a55dedd582533c0bcc85c395..f098b0bebf5d7c2f40ef239cb15f14141367202d 100644 (file)
 #include "STR_String.h"
 #include "KX_Python.h"
 
+#ifdef WITH_CXX_GUARDEDALLOC
+#include "MEM_guardedalloc.h"
+#endif
+
 struct Scene;
 
 class KX_ISceneConverter 
@@ -47,10 +51,9 @@ public:
        destinationscene: pass an empty scene, everything goes into this
        dictobj: python dictionary (for pythoncontrollers)
        */
-       virtual void ConvertScene(const STR_String& scenename,
+       virtual void ConvertScene(
                class KX_Scene* destinationscene,
                PyObject* dictobj,
-               class SCA_IInputDevice* keyinputdev,
                class RAS_IRenderTools* rendertools, 
                class RAS_ICanvas*  canvas)=0;
        
@@ -81,6 +84,13 @@ public:
        virtual bool GetGLSLMaterials()=0;
 
        virtual struct Scene* GetBlenderSceneForName(const STR_String& name)=0;
+       
+       
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_ISceneConverter"); }
+       void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif //__KX_ISCENECONVERTER_H