Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brecht@blender.org>2020-04-21 13:39:12 +0300
committerBrecht Van Lommel <brecht@blender.org>2020-04-21 14:16:59 +0300
commit5fed9ac9b5885820a6e0845120cd93f7141fdb84 (patch)
treeb5086f6168d7dbb92616b3e47e30870b0ff1dc93 /source/blender/freestyle/intern/view_map/SteerableViewMap.cpp
parentc73d6162be6437a76da94a36502770b440edc454 (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/view_map/SteerableViewMap.cpp')
-rw-r--r--source/blender/freestyle/intern/view_map/SteerableViewMap.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp b/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp
index fd8f7958e83..a6a72bfa314 100644
--- a/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp
+++ b/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp
@@ -20,7 +20,6 @@
* to.
*/
-/* clang-format off */
#include <sstream>
#include "Silhouette.h"
@@ -28,8 +27,8 @@
#include "../geometry/Geom.h"
-#include "../image/ImagePyramid.h"
#include "../image/Image.h"
+#include "../image/ImagePyramid.h"
#include "BKE_global.h"
#include "BLI_math.h"
@@ -38,7 +37,6 @@ extern "C" {
#include "IMB_imbuf.h"
#include "IMB_imbuf_types.h"
}
-/* clang-format on */
namespace Freestyle {