diff options
author | Julian Eisel <julian@blender.org> | 2020-03-26 23:03:42 +0300 |
---|---|---|
committer | Julian Eisel <julian@blender.org> | 2020-03-26 23:18:45 +0300 |
commit | c94b6209861ca7cc3985b53474feed7d94c0221a (patch) | |
tree | 752054f0dca1338cda5cf8ad4f6d18573fcca3b9 /source/blender/freestyle/intern/geometry/BBox.h | |
parent | 357ed79cb93f9d655501a828c6cddd68282de62d (diff) | |
parent | afb1a64ccb81b7ed792f64151986f40f53af8da5 (diff) |
Merge branch 'master' into wm-drag-drop-rewrite
Diffstat (limited to 'source/blender/freestyle/intern/geometry/BBox.h')
-rw-r--r-- | source/blender/freestyle/intern/geometry/BBox.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/freestyle/intern/geometry/BBox.h b/source/blender/freestyle/intern/geometry/BBox.h index 71384d33bc6..0031a7ce860 100644 --- a/source/blender/freestyle/intern/geometry/BBox.h +++ b/source/blender/freestyle/intern/geometry/BBox.h @@ -22,6 +22,7 @@ * \brief A class to hold a bounding box */ +/* clang-format off */ #include <stdlib.h> #include <algorithm> @@ -30,6 +31,7 @@ #ifdef WITH_CXX_GUARDEDALLOC # include "MEM_guardedalloc.h" #endif +/* clang-format on */ namespace Freestyle { |