Revision: 23488
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23488
Author: campbellbarton
Date: 2009-09-25 16:26:00 +0200 (Fri, 25 Sep 2009)
Log Message:
-----------
WITH_CXX_GUARDEDALLOC was broken since BL_ArmatureObject become a PyObject
Modified Paths:
--------------
trunk/blender/source/gameengine/Converter/BL_ArmatureObject.h
Modified: trunk/blender/source/gameengine/Converter/BL_ArmatureObject.h
===================================================================
--- trunk/blender/source/gameengine/Converter/BL_ArmatureObject.h
2009-09-25 13:09:18 UTC (rev 23487)
+++ trunk/blender/source/gameengine/Converter/BL_ArmatureObject.h
2009-09-25 14:26:00 UTC (rev 23488)
@@ -134,13 +134,6 @@
float m_obmat[4][4];
double m_lastapplyframe;
-
-
-#ifdef WITH_CXX_GUARDEDALLOC
-public:
- void *operator new( unsigned int num_bytes) { return
MEM_mallocN(num_bytes, "GE:BL_ArmatureObject"); }
- void operator delete( void *mem ) { MEM_freeN(mem); }
-#endif
};
/* Pose function specific to the game engine */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
