Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'source/gameengine/SceneGraph/SG_Controller.h')
-rw-r--r--source/gameengine/SceneGraph/SG_Controller.h9
1 files changed, 3 insertions, 6 deletions
diff --git a/source/gameengine/SceneGraph/SG_Controller.h b/source/gameengine/SceneGraph/SG_Controller.h
index 7100debe632..d82738dbb86 100644
--- a/source/gameengine/SceneGraph/SG_Controller.h
+++ b/source/gameengine/SceneGraph/SG_Controller.h
@@ -43,12 +43,6 @@
class SG_Controller
{
public:
-
-#ifdef WITH_CXX_GUARDEDALLOC
- void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "SG_Controller"); }
- void operator delete( void *mem ) { MEM_freeN(mem); }
-#endif
-
SG_Controller(
) :
m_pObject(NULL) {
@@ -122,6 +116,9 @@ public:
protected:
SG_IObject* m_pObject;
+#ifdef WITH_CXX_GUARDEDALLOC
+ MEM_CXX_CLASS_ALLOC_FUNCS("GE:SG_Controller")
+#endif
};
#endif //__SG_CONTROLLER_H__