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/FRS_precomp.h | |
| parent | c94b6209861ca7cc3985b53474feed7d94c0221a (diff) | |
| parent | a1d55bdd530390e58c51abe9707b8d3b0ae3e861 (diff) | |
Merge branch 'master' into wm-drag-drop-rewritewm-drag-drop-rewrite
Diffstat (limited to 'source/blender/freestyle/FRS_precomp.h')
| -rw-r--r-- | source/blender/freestyle/FRS_precomp.h | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/source/blender/freestyle/FRS_precomp.h b/source/blender/freestyle/FRS_precomp.h index 52f5b58aed0..64eac955fc9 100644 --- a/source/blender/freestyle/FRS_precomp.h +++ b/source/blender/freestyle/FRS_precomp.h @@ -1,26 +1,27 @@ /* Pre-compiled headers, see: D2606. */ -/* clang-format off */ #include <Python.h> -#include <pthread.h> -#include <string> -#include <vector> -#include <iostream> -#include <math.h> -#include <stdbool.h> + #include <algorithm> -#include <time.h> +#include <deque> +#include <fstream> +#include <iomanip> +#include <iostream> #include <iterator> +#include <list> +#include <map> +#include <math.h> #include <memory> +#include <pthread.h> #include <set> -#include <map> -#include <list> -#include <deque> #include <sstream> -#include <stdarg.h> -#include <fstream> -#include <iomanip> #include <stack> +#include <stdarg.h> +#include <stdbool.h> +#include <string> +#include <time.h> +#include <vector> + #include "intern/python/BPy_BBox.h" #include "intern/python/BPy_BinaryPredicate0D.h" #include "intern/python/BPy_BinaryPredicate1D.h" @@ -47,5 +48,3 @@ #include "intern/python/BPy_ViewMap.h" #include "intern/python/BPy_ViewShape.h" #include "intern/python/Director.h" - -/* clang-format on */ |