diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-08-04 22:50:00 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-08-04 22:50:00 +0400 |
commit | 5129112072012b687428d574c011b08abfe0b678 (patch) | |
tree | 354abcf6f0610d8f1a372b827f298030299a1e67 /source/blender/freestyle/intern/winged_edge | |
parent | 78d69a1e1598f9967738c6d2f3195e2540d274d0 (diff) |
add c++/guardedalloc to more freestyle classes, also remove redundant 'public:'
Diffstat (limited to 'source/blender/freestyle/intern/winged_edge')
6 files changed, 37 insertions, 7 deletions
diff --git a/source/blender/freestyle/intern/winged_edge/WEdge.h b/source/blender/freestyle/intern/winged_edge/WEdge.h index e5020f2a7fa..f0692aecd5b 100644 --- a/source/blender/freestyle/intern/winged_edge/WEdge.h +++ b/source/blender/freestyle/intern/winged_edge/WEdge.h @@ -245,7 +245,6 @@ public: virtual void increment(); #ifdef WITH_CXX_GUARDEDALLOC - public: MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:WVertex:incoming_edge_iterator") #endif }; @@ -330,7 +329,6 @@ public: } #ifdef WITH_CXX_GUARDEDALLOC - public: MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:WVertex:face_iterator") #endif }; @@ -1282,7 +1280,6 @@ protected: WFace *face); #ifdef WITH_CXX_GUARDEDALLOC -public: MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:WShape") #endif }; @@ -1327,7 +1324,6 @@ private: vector<WShape *> _wshapes; #ifdef WITH_CXX_GUARDEDALLOC -public: MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:WingedEdge") #endif }; diff --git a/source/blender/freestyle/intern/winged_edge/WFillGrid.h b/source/blender/freestyle/intern/winged_edge/WFillGrid.h index ca52f75847c..819bb24ffc2 100644 --- a/source/blender/freestyle/intern/winged_edge/WFillGrid.h +++ b/source/blender/freestyle/intern/winged_edge/WFillGrid.h @@ -84,7 +84,6 @@ private: unsigned _polygon_id; #ifdef WITH_CXX_GUARDEDALLOC -public: MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:WFillGrid") #endif }; diff --git a/source/blender/freestyle/intern/winged_edge/WSFillGrid.h b/source/blender/freestyle/intern/winged_edge/WSFillGrid.h index ee693de9ba1..5b33df906a6 100644 --- a/source/blender/freestyle/intern/winged_edge/WSFillGrid.h +++ b/source/blender/freestyle/intern/winged_edge/WSFillGrid.h @@ -77,8 +77,13 @@ private: Grid *_grid; WingedEdge *_winged_edge; unsigned _polygon_id; + +#ifdef WITH_CXX_GUARDEDALLOC + MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:WSFillGrid") +#endif + }; } /* namespace Freestyle */ -#endif // __FREESTYLE_WS_FILL_GRID_H__
\ No newline at end of file +#endif // __FREESTYLE_WS_FILL_GRID_H__ diff --git a/source/blender/freestyle/intern/winged_edge/WXEdge.h b/source/blender/freestyle/intern/winged_edge/WXEdge.h index f696e279ad0..364183bbc84 100644 --- a/source/blender/freestyle/intern/winged_edge/WXEdge.h +++ b/source/blender/freestyle/intern/winged_edge/WXEdge.h @@ -95,6 +95,11 @@ public: { return _curvatures; } + +#ifdef WITH_CXX_GUARDEDALLOC + MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:WXVertex") +#endif + }; @@ -197,6 +202,11 @@ public: { _order = i; } + +#ifdef WITH_CXX_GUARDEDALLOC + MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:WXEdge") +#endif + }; /********************************** @@ -686,6 +696,11 @@ public: (*wxf)->userdata = NULL; } } + +#ifdef WITH_CXX_GUARDEDALLOC + MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:WXFace") +#endif + }; @@ -782,6 +797,11 @@ public: } } /*! accessors */ + +#ifdef WITH_CXX_GUARDEDALLOC + MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:WXShape") +#endif + }; /* diff --git a/source/blender/freestyle/intern/winged_edge/WXEdgeBuilder.h b/source/blender/freestyle/intern/winged_edge/WXEdgeBuilder.h index 0c3e97f7806..5579989072a 100644 --- a/source/blender/freestyle/intern/winged_edge/WXEdgeBuilder.h +++ b/source/blender/freestyle/intern/winged_edge/WXEdgeBuilder.h @@ -44,6 +44,11 @@ public: protected: virtual void buildWVertices(WShape& shape, const real *vertices, unsigned vsize); + +#ifdef WITH_CXX_GUARDEDALLOC + MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:WXEdgeBuilder") +#endif + }; } /* namespace Freestyle */ diff --git a/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.h b/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.h index d8a045adfa3..d68acaf29c1 100644 --- a/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.h +++ b/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.h @@ -147,8 +147,13 @@ private: WingedEdge *_winged_edge; Matrix44r *_current_matrix; vector<Matrix44r *> _matrices_stack; + +#ifdef WITH_CXX_GUARDEDALLOC + MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:WingedEdgeBuilder") +#endif + }; } /* namespace Freestyle */ -#endif // __FREESTYLE_WINGED_EDGE_BUILDER_H__
\ No newline at end of file +#endif // __FREESTYLE_WINGED_EDGE_BUILDER_H__ |