diff options
| author | Matt Ebb <matt@mke3.net> | 2009-08-25 05:37:08 +0400 |
|---|---|---|
| committer | Matt Ebb <matt@mke3.net> | 2009-08-25 05:37:08 +0400 |
| commit | ea97a373834ea956ad0778b2c535452a6ecb1752 (patch) | |
| tree | 9da83b01797e1697bc6f99e999bee927e072b3e0 /source/gameengine/GameLogic/SCA_PropertyEventManager.h | |
| parent | 90895fce8ca4f40bd41026b0406d80e8e83e0e8d (diff) | |
| parent | 4a78b9e9046567e86ed3ccada83a50c43684facd (diff) | |
svn merge -r 22628:22753 https://svn.blender.org/svnroot/bf-blender/branches/blender2.5/blendervolume25
Diffstat (limited to 'source/gameengine/GameLogic/SCA_PropertyEventManager.h')
| -rw-r--r-- | source/gameengine/GameLogic/SCA_PropertyEventManager.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/source/gameengine/GameLogic/SCA_PropertyEventManager.h b/source/gameengine/GameLogic/SCA_PropertyEventManager.h index 011f3285f63..a9692377df8 100644 --- a/source/gameengine/GameLogic/SCA_PropertyEventManager.h +++ b/source/gameengine/GameLogic/SCA_PropertyEventManager.h @@ -40,16 +40,17 @@ class SCA_PropertyEventManager : public SCA_EventManager class SCA_LogicManager* m_logicmgr; public: + SCA_PropertyEventManager(class SCA_LogicManager* logicmgr); + virtual ~SCA_PropertyEventManager(); + virtual void NextFrame(); + //SCA_LogicManager* GetLogicManager() { return m_logicmgr;} + #ifdef WITH_CXX_GUARDEDALLOC +public: void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_PropertyEventManager"); } void operator delete( void *mem ) { MEM_freeN(mem); } #endif - - SCA_PropertyEventManager(class SCA_LogicManager* logicmgr); - virtual ~SCA_PropertyEventManager(); - virtual void NextFrame(); - //SCA_LogicManager* GetLogicManager() { return m_logicmgr;} }; #endif //__KX_PROPERTYEVENTMANAGER |