diff options
| author | Julian Eisel <julian@blender.org> | 2020-06-05 14:09:31 +0300 |
|---|---|---|
| committer | Julian Eisel <julian@blender.org> | 2020-06-05 14:09:31 +0300 |
| commit | 920a58d9b6d667894cf166cbbd25e4c2fbd238ea (patch) | |
| tree | 7ca5a9da640753b5e070c439ac3bdd14dfad92cf /source/blender/freestyle/intern/winged_edge/WXEdgeBuilder.cpp | |
| parent | c94b6209861ca7cc3985b53474feed7d94c0221a (diff) | |
| parent | a1d55bdd530390e58c51abe9707b8d3b0ae3e861 (diff) | |
Merge branch 'master' into wm-drag-drop-rewritewm-drag-drop-rewrite
Diffstat (limited to 'source/blender/freestyle/intern/winged_edge/WXEdgeBuilder.cpp')
| -rw-r--r-- | source/blender/freestyle/intern/winged_edge/WXEdgeBuilder.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/source/blender/freestyle/intern/winged_edge/WXEdgeBuilder.cpp b/source/blender/freestyle/intern/winged_edge/WXEdgeBuilder.cpp index e6062a605ba..9be3da4420b 100644 --- a/source/blender/freestyle/intern/winged_edge/WXEdgeBuilder.cpp +++ b/source/blender/freestyle/intern/winged_edge/WXEdgeBuilder.cpp @@ -20,10 +20,8 @@ * info (silhouette etc...)) structure from a polygonal model */ -/* clang-format off */ -#include "WXEdge.h" #include "WXEdgeBuilder.h" -/* clang-format on */ +#include "WXEdge.h" namespace Freestyle { |