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/application/AppView.h | |
| parent | c94b6209861ca7cc3985b53474feed7d94c0221a (diff) | |
| parent | a1d55bdd530390e58c51abe9707b8d3b0ae3e861 (diff) | |
Merge branch 'master' into wm-drag-drop-rewritewm-drag-drop-rewrite
Diffstat (limited to 'source/blender/freestyle/intern/application/AppView.h')
| -rw-r--r-- | source/blender/freestyle/intern/application/AppView.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/freestyle/intern/application/AppView.h b/source/blender/freestyle/intern/application/AppView.h index 4c60b1515f3..6009f2b0e50 100644 --- a/source/blender/freestyle/intern/application/AppView.h +++ b/source/blender/freestyle/intern/application/AppView.h @@ -21,10 +21,10 @@ * \ingroup freestyle */ -/* clang-format off */ #include "AppConfig.h" -#include "../geometry/Geom.h" + #include "../geometry/BBox.h" +#include "../geometry/Geom.h" #include "../scene_graph/NodeDrawingStyle.h" #include "../system/Precision.h" @@ -33,7 +33,6 @@ #ifdef WITH_CXX_GUARDEDALLOC # include "MEM_guardedalloc.h" #endif -/* clang-format on */ namespace Freestyle { |