From 6ea2dec330a0d460deb1396f258c461be34fa3c8 Mon Sep 17 00:00:00 2001 From: Tamito Kajiyama Date: Mon, 13 May 2013 22:58:27 +0000 Subject: Added support for WITH_CXX_GUARDEDALLOC build option to the Freestyle module. --- source/blender/freestyle/intern/view_map/BoxGrid.h | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'source/blender/freestyle/intern/view_map/BoxGrid.h') diff --git a/source/blender/freestyle/intern/view_map/BoxGrid.h b/source/blender/freestyle/intern/view_map/BoxGrid.h index 5ceb84761bf..8aa5167732d 100644 --- a/source/blender/freestyle/intern/view_map/BoxGrid.h +++ b/source/blender/freestyle/intern/view_map/BoxGrid.h @@ -50,6 +50,10 @@ #include "BKE_global.h" +#ifdef WITH_CXX_GUARDEDALLOC +#include "MEM_guardedalloc.h" +#endif + namespace Freestyle { class BoxGrid @@ -66,6 +70,11 @@ public: // However, code comments make it clear that userdata is deprecated, so we avoid the temptation // to save 4 or 8 bytes. WFace *face; + +#ifdef WITH_CXX_GUARDEDALLOC + public: + MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:BoxGrid:OccluderData") +#endif }; private: @@ -126,6 +135,11 @@ public: real _occludeeDepth; //deque::iterator _current, _occludeeCandidate; vector::iterator _current, _occludeeCandidate; + +#ifdef WITH_CXX_GUARDEDALLOC + public: + MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:BoxGrid:Iterator") +#endif }; class Transform : public GridHelpers::Transform @@ -176,6 +190,11 @@ private: occluderContainer _faces; Vec3r _viewpoint; bool _enableQI; + +#ifdef WITH_CXX_GUARDEDALLOC +public: + MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:BoxGrid") +#endif }; inline void BoxGrid::Iterator::initBeforeTarget() -- cgit v1.2.3