diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-05-14 02:58:27 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-05-14 02:58:27 +0400 |
| commit | 6ea2dec330a0d460deb1396f258c461be34fa3c8 (patch) | |
| tree | 567536490f059ab57592b5352b60f253b7e3ea1c /source/blender/freestyle/intern/scene_graph | |
| parent | 1a91af691e984714204aa55326245c79a0b06fb8 (diff) | |
Added support for WITH_CXX_GUARDEDALLOC build option to the Freestyle module.
Diffstat (limited to 'source/blender/freestyle/intern/scene_graph')
3 files changed, 26 insertions, 0 deletions
diff --git a/source/blender/freestyle/intern/scene_graph/DrawingStyle.h b/source/blender/freestyle/intern/scene_graph/DrawingStyle.h index b95e96a09aa..9fbdd0e0fad 100644 --- a/source/blender/freestyle/intern/scene_graph/DrawingStyle.h +++ b/source/blender/freestyle/intern/scene_graph/DrawingStyle.h @@ -28,6 +28,10 @@ * \date 10/10/2002 */ +#ifdef WITH_CXX_GUARDEDALLOC +#include "MEM_guardedalloc.h" +#endif + namespace Freestyle { class DrawingStyle @@ -100,6 +104,11 @@ private: float LineWidth; float PointSize; bool LightingEnabled; + +#ifdef WITH_CXX_GUARDEDALLOC +public: + MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:DrawingStyle") +#endif }; DrawingStyle::DrawingStyle(const DrawingStyle& iBrother) diff --git a/source/blender/freestyle/intern/scene_graph/FrsMaterial.h b/source/blender/freestyle/intern/scene_graph/FrsMaterial.h index 43a61e772f9..7e9eeda26d5 100644 --- a/source/blender/freestyle/intern/scene_graph/FrsMaterial.h +++ b/source/blender/freestyle/intern/scene_graph/FrsMaterial.h @@ -30,6 +30,10 @@ #include "../system/FreestyleConfig.h" +#ifdef WITH_CXX_GUARDEDALLOC +#include "MEM_guardedalloc.h" +#endif + namespace Freestyle { /*! Class defining a material */ @@ -253,6 +257,11 @@ private: float Ambient[4]; float Emission[4]; float Shininess; + +#ifdef WITH_CXX_GUARDEDALLOC +public: + MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:FrsMaterial") +#endif }; FrsMaterial::FrsMaterial() diff --git a/source/blender/freestyle/intern/scene_graph/SceneVisitor.h b/source/blender/freestyle/intern/scene_graph/SceneVisitor.h index 1f1be21df72..d3870fe835d 100644 --- a/source/blender/freestyle/intern/scene_graph/SceneVisitor.h +++ b/source/blender/freestyle/intern/scene_graph/SceneVisitor.h @@ -30,6 +30,10 @@ #include "../system/FreestyleConfig.h" +#ifdef WITH_CXX_GUARDEDALLOC +#include "MEM_guardedalloc.h" +#endif + namespace Freestyle { #define VISIT_COMPLETE_DEF(type) \ @@ -92,6 +96,10 @@ public: VISIT_COMPLETE_DEF(IndexedFaceSet) VISIT_COMPLETE_DEF(DrawingStyle) VISIT_COMPLETE_DEF(FrsMaterial) + +#ifdef WITH_CXX_GUARDEDALLOC + MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:SceneVisitor") +#endif }; } /* namespace Freestyle */ |