svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r22875:22935
[blender-staging.git] / source / gameengine / Rasterizer / RAS_MaterialBucket.h
index 49837652483d5fea0a06bbbf6ecb0524e0dacc45..dc9abbfbddfa633bbf4f3b0524e6e174c4ab1172 100644 (file)
@@ -172,6 +172,13 @@ public:
        bool IsCulled() { return m_bCulled; }
 #endif
        void SetCulled(bool culled) { m_bCulled = culled; }
+       
+       
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:RAS_MeshSlot"); }
+       void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 /* Used by RAS_MeshObject, to point to it's slots in a bucket */
@@ -182,6 +189,13 @@ public:
        RAS_MeshSlot *m_baseslot;
        class RAS_MaterialBucket *m_bucket;
        GEN_Map<GEN_HashedPtr,RAS_MeshSlot*> m_slots;
+
+
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:RAS_MeshMaterial"); }
+       void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 /* Contains a list of display arrays with the same material,
@@ -235,6 +249,12 @@ private:
        RAS_IPolyMaterial*                      m_material;
        SG_DList                                        m_activeMeshSlotsHead;  // only those which must be rendered
        
+
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:RAS_MaterialBucket"); }
+       void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif //__RAS_MATERIAL_BUCKET