diff options
| author | Arystanbek Dyussenov <arystan.d@gmail.com> | 2010-09-04 22:49:07 +0400 |
|---|---|---|
| committer | Arystanbek Dyussenov <arystan.d@gmail.com> | 2010-09-04 22:49:07 +0400 |
| commit | 90b464d3728d9ed8ec26fdf59058d236b99dbcd9 (patch) | |
| tree | e88cab4fb1358e962b19f658064ca8c9f8d29f5b /source/gameengine/Ketsji/KX_Scene.h | |
| parent | 08d02dd04d836976b25793bb1d4c6a86b3f924c7 (diff) | |
| parent | b0b787ef38f9947b3176642556f5282eb3518f69 (diff) | |
COLLADA branch: merge from trunk -r 28015:31610.soc-2009-chingachgook
Diffstat (limited to 'source/gameengine/Ketsji/KX_Scene.h')
| -rw-r--r-- | source/gameengine/Ketsji/KX_Scene.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/source/gameengine/Ketsji/KX_Scene.h b/source/gameengine/Ketsji/KX_Scene.h index 407f3f1cf1a..cd8277ec39f 100644 --- a/source/gameengine/Ketsji/KX_Scene.h +++ b/source/gameengine/Ketsji/KX_Scene.h @@ -45,6 +45,7 @@ #include "RAS_FramingManager.h" #include "RAS_Rect.h" + #include "PyObjectPlus.h" #include "RAS_2DFilterManager.h" @@ -83,6 +84,10 @@ class btCollisionShape; class KX_BlenderSceneConverter; struct KX_ClientObjectInfo; +#ifdef WITH_CXX_GUARDEDALLOC +#include "MEM_guardedalloc.h" +#endif + /* for ID freeing */ #define IS_TAGGED(_id) ((_id) && (((ID *)_id)->flag & LIB_DOIT)) @@ -280,7 +285,8 @@ public: class SCA_IInputDevice* mousedevice, class NG_NetworkDeviceInterface* ndi, const STR_String& scenename, - struct Scene* scene); + struct Scene* scene, + class RAS_ICanvas* canvas); virtual ~KX_Scene(); @@ -608,8 +614,6 @@ public: //void PrintStats(int verbose_level) { // m_bucketmanager->PrintStats(verbose_level) //} - - }; typedef std::vector<KX_Scene*> KX_SceneList; |