add c++/guardedalloc to more freestyle classes, also remove redundant 'public:'

7 files changed, 35 insertions, 2 deletions

diff --git a/source/blender/freestyle/intern/scene_graph/DrawingStyle.h b/source/blender/freestyle/intern/scene_graph/DrawingStyle.h
index 9fbdd0e0fad..192fa76c497 100644
--- a/source/blender/freestyle/intern/scene_graph/DrawingStyle.h
+++ b/source/blender/freestyle/intern/scene_graph/DrawingStyle.h
@@ -106,7 +106,6 @@ private:
 	bool LightingEnabled;
 
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
 	MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:DrawingStyle")
 #endif
 };
diff --git a/source/blender/freestyle/intern/scene_graph/FrsMaterial.h b/source/blender/freestyle/intern/scene_graph/FrsMaterial.h
index 7e9eeda26d5..4d1fc4e69c9 100644
--- a/source/blender/freestyle/intern/scene_graph/FrsMaterial.h
+++ b/source/blender/freestyle/intern/scene_graph/FrsMaterial.h
@@ -259,7 +259,6 @@ private:
 	float Shininess;
 
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
 	MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:FrsMaterial")
 #endif
 };
diff --git a/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.h b/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.h
index 2995360fb24..1ffddc9b24d 100644
--- a/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.h
+++ b/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.h
@@ -312,6 +312,11 @@ protected:
 	unsigned _TISize;
 
 	unsigned int _displayList;
+
+#ifdef WITH_CXX_GUARDEDALLOC
+	MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:IndexedFaceSet")
+#endif
+
 };
 
 } /* namespace Freestyle */
diff --git a/source/blender/freestyle/intern/scene_graph/LineRep.h b/source/blender/freestyle/intern/scene_graph/LineRep.h
index c5de30309f6..6452e1260ad 100644
--- a/source/blender/freestyle/intern/scene_graph/LineRep.h
+++ b/source/blender/freestyle/intern/scene_graph/LineRep.h
@@ -148,6 +148,11 @@ private:
 	LINES_STYLE _Style;
 	vector<Vec3r> _vertices;
 	float _width;
+
+#ifdef WITH_CXX_GUARDEDALLOC
+	MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:LineRep")
+#endif
+
 };
 
 } /* namespace Freestyle */
diff --git a/source/blender/freestyle/intern/scene_graph/Node.h b/source/blender/freestyle/intern/scene_graph/Node.h
index 47ce6aaf8e6..ba8549f5128 100644
--- a/source/blender/freestyle/intern/scene_graph/Node.h
+++ b/source/blender/freestyle/intern/scene_graph/Node.h
@@ -106,6 +106,11 @@ protected:
 
 private: 
 	BBox<Vec3r> _BBox;
+
+#ifdef WITH_CXX_GUARDEDALLOC
+	MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:Node")
+#endif
+
 };
 
 } /* namespace Freestyle */
diff --git a/source/blender/freestyle/intern/scene_graph/NodeCamera.h b/source/blender/freestyle/intern/scene_graph/NodeCamera.h
index 8e5cf9be52d..ee630e91884 100644
--- a/source/blender/freestyle/intern/scene_graph/NodeCamera.h
+++ b/source/blender/freestyle/intern/scene_graph/NodeCamera.h
@@ -83,6 +83,11 @@ protected:
 	double projection_matrix_[16];
 
 	CameraType camera_type_;
+
+#ifdef WITH_CXX_GUARDEDALLOC
+	MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:NodeCamera")
+#endif
+
 };
 
 class LIB_SCENE_GRAPH_EXPORT NodeOrthographicCamera : public NodeCamera
@@ -145,6 +150,11 @@ private:
 	double top_;
 	double zNear_;
 	double zFar_;
+
+#ifdef WITH_CXX_GUARDEDALLOC
+	MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:NodeOrthographicCamera")
+#endif
+
 };
 
 class LIB_SCENE_GRAPH_EXPORT NodePerspectiveCamera : public NodeCamera
@@ -205,6 +215,11 @@ public:
 	 *           zFar-zNear
 	 */
 	NodePerspectiveCamera(double left, double right, double bottom, double top, double zNear, double zFar);
+
+#ifdef WITH_CXX_GUARDEDALLOC
+	MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:NodePerspectiveCamera")
+#endif
+
 };
 
 } /* namespace Freestyle */
diff --git a/source/blender/freestyle/intern/scene_graph/NodeDrawingStyle.h b/source/blender/freestyle/intern/scene_graph/NodeDrawingStyle.h
index a846b050db1..7e8c6635953 100644
--- a/source/blender/freestyle/intern/scene_graph/NodeDrawingStyle.h
+++ b/source/blender/freestyle/intern/scene_graph/NodeDrawingStyle.h
@@ -101,6 +101,11 @@ public:
 
 private:
 	DrawingStyle _DrawingStyle;
+
+#ifdef WITH_CXX_GUARDEDALLOC
+	MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:NodeDrawingStyle")
+#endif
+
 };
 
 } /* namespace Freestyle */