Added support for WITH_CXX_GUARDEDALLOC build option to the Freestyle module.

3 files changed, 26 insertions, 0 deletions

diff --git a/source/blender/freestyle/intern/application/AppConfig.h b/source/blender/freestyle/intern/application/AppConfig.h
index d647b7fc59c..ad64fce2c44 100644
--- a/source/blender/freestyle/intern/application/AppConfig.h
+++ b/source/blender/freestyle/intern/application/AppConfig.h
@@ -32,6 +32,10 @@
 #include "../system/FreestyleConfig.h"
 #include "../system/Precision.h"
 
+#ifdef WITH_CXX_GUARDEDALLOC
+#include "MEM_guardedalloc.h"
+#endif
+
 using namespace std;
 
 namespace Freestyle {
@@ -68,6 +72,10 @@ public:
 	const string& getHomeDir() const {return _HomeDir;}
 
 	static string getEnvVar(const string& iEnvVarName);
+
+#ifdef WITH_CXX_GUARDEDALLOC
+	MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:Config:Path")
+#endif
 };
 
 //
diff --git a/source/blender/freestyle/intern/application/AppView.h b/source/blender/freestyle/intern/application/AppView.h
index 0a9bc6449f4..ca250f89850 100644
--- a/source/blender/freestyle/intern/application/AppView.h
+++ b/source/blender/freestyle/intern/application/AppView.h
@@ -31,6 +31,10 @@
 #include "../scene_graph/NodeDrawingStyle.h"
 #include "../system/Precision.h"
 
+#ifdef WITH_CXX_GUARDEDALLOC
+#include "MEM_guardedalloc.h"
+#endif
+
 namespace Freestyle {
 
 using namespace Geometry;
@@ -228,6 +232,11 @@ protected:
 	bool _Draw3DScene;
 	NodeGroup _p2DNode;
 	NodeDrawingStyle *_p2DSelectionNode;
+
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:AppView")
+#endif
 };
 
 } /* namespace Freestyle */
diff --git a/source/blender/freestyle/intern/application/Controller.h b/source/blender/freestyle/intern/application/Controller.h
index ff9a85f8041..3315fe7e20b 100644
--- a/source/blender/freestyle/intern/application/Controller.h
+++ b/source/blender/freestyle/intern/application/Controller.h
@@ -45,6 +45,10 @@ extern "C" {
 #include "DNA_scene_types.h"
 }
 
+#ifdef WITH_CXX_GUARDEDALLOC
+#include "MEM_guardedalloc.h"
+#endif
+
 namespace Freestyle {
 
 class AppView;
@@ -238,6 +242,11 @@ private:
 	bool _ComputeSteerableViewMap;
 
 	FEdgeXDetector edgeDetector;
+
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:Controller")
+#endif
 };
 
 extern Controller *g_pController;