diff options
author | Brecht Van Lommel <brecht@blender.org> | 2020-04-21 13:39:12 +0300 |
---|---|---|
committer | Brecht Van Lommel <brecht@blender.org> | 2020-04-21 14:16:59 +0300 |
commit | 5fed9ac9b5885820a6e0845120cd93f7141fdb84 (patch) | |
tree | b5086f6168d7dbb92616b3e47e30870b0ff1dc93 /source/blender/freestyle/intern/system | |
parent | c73d6162be6437a76da94a36502770b440edc454 (diff) |
Fix clang-format differences between version 6 and 9
Version 6 does not appear to respect clang-format off for header sorting.
Diffstat (limited to 'source/blender/freestyle/intern/system')
-rw-r--r-- | source/blender/freestyle/intern/system/PythonInterpreter.h | 4 | ||||
-rw-r--r-- | source/blender/freestyle/intern/system/StringUtils.cpp | 4 | ||||
-rw-r--r-- | source/blender/freestyle/intern/system/StringUtils.h | 4 |
3 files changed, 3 insertions, 9 deletions
diff --git a/source/blender/freestyle/intern/system/PythonInterpreter.h b/source/blender/freestyle/intern/system/PythonInterpreter.h index 785bc0f4330..4bc6ba9db38 100644 --- a/source/blender/freestyle/intern/system/PythonInterpreter.h +++ b/source/blender/freestyle/intern/system/PythonInterpreter.h @@ -22,15 +22,14 @@ * \brief Python Interpreter */ -/* clang-format off */ #include <iostream> extern "C" { #include <Python.h> } -#include "StringUtils.h" #include "Interpreter.h" +#include "StringUtils.h" #include "MEM_guardedalloc.h" @@ -49,7 +48,6 @@ extern "C" { #include "bpy_capi_utils.h" } -/* clang-format on */ namespace Freestyle { diff --git a/source/blender/freestyle/intern/system/StringUtils.cpp b/source/blender/freestyle/intern/system/StringUtils.cpp index cd85aaaa5ff..90210f33a25 100644 --- a/source/blender/freestyle/intern/system/StringUtils.cpp +++ b/source/blender/freestyle/intern/system/StringUtils.cpp @@ -19,12 +19,10 @@ * \brief String utilities */ -/* clang-format off */ // soc #include <qfileinfo.h> -#include "FreestyleConfig.h" #include "StringUtils.h" -/* clang-format on */ +#include "FreestyleConfig.h" namespace Freestyle { diff --git a/source/blender/freestyle/intern/system/StringUtils.h b/source/blender/freestyle/intern/system/StringUtils.h index 16944e47335..aeacddd64c8 100644 --- a/source/blender/freestyle/intern/system/StringUtils.h +++ b/source/blender/freestyle/intern/system/StringUtils.h @@ -22,7 +22,6 @@ * \brief String utilities */ -/* clang-format off */ #include <cstring> #include <iostream> #include <sstream> @@ -30,10 +29,9 @@ #include <vector> extern "C" { -#include "BLI_string.h" #include "BLI_path_util.h" +#include "BLI_string.h" } -/* clang-format on */ using namespace std; |