Merge with -r 22620:23107.
[blender.git] / source / gameengine / GameLogic / SCA_PropertyEventManager.h
index 011f3285f637f780356025cb80a9fd60ca814a43..a9692377df80a89fad2fb4b9e63d1a6c7d89a3a4 100644 (file)
@@ -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