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/winged_edge
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/winged_edge')
-rw-r--r--source/blender/freestyle/intern/winged_edge/WFillGrid.cpp4
-rw-r--r--source/blender/freestyle/intern/winged_edge/WSFillGrid.cpp4
-rw-r--r--source/blender/freestyle/intern/winged_edge/WXEdgeBuilder.cpp4
3 files changed, 3 insertions, 9 deletions
diff --git a/source/blender/freestyle/intern/winged_edge/WFillGrid.cpp b/source/blender/freestyle/intern/winged_edge/WFillGrid.cpp
index b6dfb183d0f..f54b54f5a3a 100644
--- a/source/blender/freestyle/intern/winged_edge/WFillGrid.cpp
+++ b/source/blender/freestyle/intern/winged_edge/WFillGrid.cpp
@@ -19,10 +19,8 @@
* \brief Class to fill in a grid from a SceneGraph (uses only the WingedEdge structures)
*/
-/* clang-format off */
-#include "WEdge.h"
#include "WFillGrid.h"
-/* clang-format on */
+#include "WEdge.h"
namespace Freestyle {
diff --git a/source/blender/freestyle/intern/winged_edge/WSFillGrid.cpp b/source/blender/freestyle/intern/winged_edge/WSFillGrid.cpp
index 2fa9e51fa7f..e1cb1c29f63 100644
--- a/source/blender/freestyle/intern/winged_edge/WSFillGrid.cpp
+++ b/source/blender/freestyle/intern/winged_edge/WSFillGrid.cpp
@@ -19,10 +19,8 @@
* \brief Class to fill in a grid from a SceneGraph (uses only the WingedEdge structures)
*/
-/* clang-format off */
-#include "WEdge.h"
#include "WSFillGrid.h"
-/* clang-format on */
+#include "WEdge.h"
namespace Freestyle {
diff --git a/source/blender/freestyle/intern/winged_edge/WXEdgeBuilder.cpp b/source/blender/freestyle/intern/winged_edge/WXEdgeBuilder.cpp
index e6062a605ba..9be3da4420b 100644
--- a/source/blender/freestyle/intern/winged_edge/WXEdgeBuilder.cpp
+++ b/source/blender/freestyle/intern/winged_edge/WXEdgeBuilder.cpp
@@ -20,10 +20,8 @@
* info (silhouette etc...)) structure from a polygonal model
*/
-/* clang-format off */
-#include "WXEdge.h"
#include "WXEdgeBuilder.h"
-/* clang-format on */
+#include "WXEdge.h"
namespace Freestyle {