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/solver_control.h | |
| parent | 6167313105cd0b65ba777459ce9333ac51e0cb3b (diff) | |
| parent | 2ce3bd0d672e7e26e1a8710444872ad6478a7565 (diff) | |
Merged revisions 60248-60717 from trunk/blendersoc-2013-bge
Diffstat (limited to 'intern/elbeem/intern/solver_control.h')
| -rw-r--r-- | intern/elbeem/intern/solver_control.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/intern/elbeem/intern/solver_control.h b/intern/elbeem/intern/solver_control.h index afbe5394918..d20823d1827 100644 --- a/intern/elbeem/intern/solver_control.h +++ b/intern/elbeem/intern/solver_control.h @@ -16,6 +16,10 @@ #ifndef LBM_TESTCLASS_H #define LBM_TESTCLASS_H +#ifdef WITH_CXX_GUARDEDALLOC +# include "MEM_guardedalloc.h" +#endif + //class IsoSurface; class ParticleObject; class ControlParticles; @@ -147,6 +151,11 @@ class LbmControlSet { AnimChannel<ntlVec3f> mcCpScale; AnimChannel<ntlVec3f> mcCpOffset; + +private: +#ifdef WITH_CXX_GUARDEDALLOC + MEM_CXX_CLASS_ALLOC_FUNCS("ELBEEM:LbmControlSet") +#endif }; @@ -180,6 +189,11 @@ class LbmControlData // cp debug displau LbmFloat mDebugCpscale, mDebugVelScale, mDebugCompavScale, mDebugAttScale, mDebugMaxdScale, mDebugAvgVelScale; + +private: +#ifdef WITH_CXX_GUARDEDALLOC + MEM_CXX_CLASS_ALLOC_FUNCS("ELBEEM:LbmControlData ") +#endif }; #endif // LBM_TESTCLASS_H |