diff options
| author | Daniel Stokes <kupomail@gmail.com> | 2013-10-14 00:59:55 +0400 |
|---|---|---|
| committer | Daniel Stokes <kupomail@gmail.com> | 2013-10-14 00:59:55 +0400 |
| commit | 0aa392d2ff4cc29f2e53485a6456a7deb838e1bb (patch) | |
| tree | 50aa44367f0df077be6115c1f9deb85656018d4d /intern/elbeem/intern/simulation_object.h | |
| parent | 6167313105cd0b65ba777459ce9333ac51e0cb3b (diff) | |
| parent | 2ce3bd0d672e7e26e1a8710444872ad6478a7565 (diff) | |
Merged revisions 60248-60717 from trunk/blendersoc-2013-bge
Diffstat (limited to 'intern/elbeem/intern/simulation_object.h')
| -rw-r--r-- | intern/elbeem/intern/simulation_object.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/intern/elbeem/intern/simulation_object.h b/intern/elbeem/intern/simulation_object.h index 76684fa6f83..4a89d1510a9 100644 --- a/intern/elbeem/intern/simulation_object.h +++ b/intern/elbeem/intern/simulation_object.h @@ -18,6 +18,10 @@ #include "ntl_geometryshader.h" #include "parametrizer.h" +#ifdef WITH_CXX_GUARDEDALLOC +# include "MEM_guardedalloc.h" +#endif + class LbmSolverInterface; class CellIdentifierInterface; class ntlTree; @@ -188,6 +192,11 @@ class SimulationObject : virtual inline ntlVec3Gfx *getBBStart() { return &mGeoStart; } virtual inline ntlVec3Gfx *getBBEnd() { return &mGeoEnd; } + +private: +#ifdef WITH_CXX_GUARDEDALLOC + MEM_CXX_CLASS_ALLOC_FUNCS("ELBEEM:SimulationObject") +#endif }; |