diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-06-06 05:15:44 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-06-06 05:15:44 +0400 |
| commit | ed338da8c963cfcc26315584bb694a95f2c89088 (patch) | |
| tree | e21a68328e7d0d1f4d41f95fd27690172bfc0957 /source/gameengine/Ketsji/KX_Scene.h | |
| parent | 0cc077ec455e701a1d3caa1350051f7d3737763b (diff) | |
- WITH_CXX_GUARDEDALLOC working again
- CMake building without python or fluidsim working again (broke in recent commit)
- remove BLI_short_filename(), it wasnt used anywhere.
Diffstat (limited to 'source/gameengine/Ketsji/KX_Scene.h')
| -rw-r--r-- | source/gameengine/Ketsji/KX_Scene.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/gameengine/Ketsji/KX_Scene.h b/source/gameengine/Ketsji/KX_Scene.h index 4755eee6a6b..cd8277ec39f 100644 --- a/source/gameengine/Ketsji/KX_Scene.h +++ b/source/gameengine/Ketsji/KX_Scene.h @@ -84,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)) @@ -610,8 +614,6 @@ public: //void PrintStats(int verbose_level) { // m_bucketmanager->PrintStats(verbose_level) //} - - }; typedef std::vector<KX_Scene*> KX_SceneList; |