diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:17:24 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:21:24 +0300 |
commit | e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch) | |
tree | 8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/freestyle/intern/winged_edge/WFillGrid.h | |
parent | b3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (diff) |
ClangFormat: apply to source, most of intern
Apply clang format as proposed in T53211.
For details on usage and instructions for migrating branches
without conflicts, see:
https://wiki.blender.org/wiki/Tools/ClangFormat
Diffstat (limited to 'source/blender/freestyle/intern/winged_edge/WFillGrid.h')
-rw-r--r-- | source/blender/freestyle/intern/winged_edge/WFillGrid.h | 91 |
1 files changed, 46 insertions, 45 deletions
diff --git a/source/blender/freestyle/intern/winged_edge/WFillGrid.h b/source/blender/freestyle/intern/winged_edge/WFillGrid.h index 0e86d1a1684..f9e63464e30 100644 --- a/source/blender/freestyle/intern/winged_edge/WFillGrid.h +++ b/source/blender/freestyle/intern/winged_edge/WFillGrid.h @@ -28,59 +28,60 @@ #include "../geometry/Polygon.h" #ifdef WITH_CXX_GUARDEDALLOC -#include "MEM_guardedalloc.h" +# include "MEM_guardedalloc.h" #endif namespace Freestyle { -class WFillGrid -{ -public: - inline WFillGrid(Grid *grid = NULL, WingedEdge *winged_edge = NULL) - { - _winged_edge = winged_edge; - _grid = grid; - _polygon_id = 0; - } - - virtual ~WFillGrid() {} - - void fillGrid(); - - /*! Accessors */ - WingedEdge *getWingedEdge() - { - return _winged_edge; - } - - Grid *getGrid() - { - return _grid; - } - - /*! Modifiers */ - void setWingedEdge(WingedEdge *winged_edge) - { - if (winged_edge) - _winged_edge = winged_edge; - } - - void setGrid(Grid *grid) - { - if (grid) - _grid = grid; - } - -private: - Grid *_grid; - WingedEdge *_winged_edge; - unsigned _polygon_id; +class WFillGrid { + public: + inline WFillGrid(Grid *grid = NULL, WingedEdge *winged_edge = NULL) + { + _winged_edge = winged_edge; + _grid = grid; + _polygon_id = 0; + } + + virtual ~WFillGrid() + { + } + + void fillGrid(); + + /*! Accessors */ + WingedEdge *getWingedEdge() + { + return _winged_edge; + } + + Grid *getGrid() + { + return _grid; + } + + /*! Modifiers */ + void setWingedEdge(WingedEdge *winged_edge) + { + if (winged_edge) + _winged_edge = winged_edge; + } + + void setGrid(Grid *grid) + { + if (grid) + _grid = grid; + } + + private: + Grid *_grid; + WingedEdge *_winged_edge; + unsigned _polygon_id; #ifdef WITH_CXX_GUARDEDALLOC - MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:WFillGrid") + MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:WFillGrid") #endif }; } /* namespace Freestyle */ -#endif // __FREESTYLE_W_FILL_GRID_H__ +#endif // __FREESTYLE_W_FILL_GRID_H__ |