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:
authorDalai Felinto <dalai@blender.org>2020-03-06 18:45:16 +0300
committerDalai Felinto <dalai@blender.org>2020-03-06 19:26:32 +0300
commit85424397b1847d80d7a0b6bcbf7cb3c3aa3d0181 (patch)
treed009ab527aad3b4a451f6dfaab75f62c6348dc83 /source/blender/freestyle/intern/application
parent96e2bd84932a826d09b7ed2201ba67a0a74f0b29 (diff)
Cleanup: tweak Freestyle #includes in preparation for clang-format sorting
Diffstat (limited to 'source/blender/freestyle/intern/application')
-rw-r--r--source/blender/freestyle/intern/application/AppCanvas.cpp3
-rw-r--r--source/blender/freestyle/intern/application/AppConfig.h2
-rw-r--r--source/blender/freestyle/intern/application/AppView.cpp2
-rw-r--r--source/blender/freestyle/intern/application/AppView.h2
-rw-r--r--source/blender/freestyle/intern/application/Controller.cpp2
5 files changed, 10 insertions, 1 deletions
diff --git a/source/blender/freestyle/intern/application/AppCanvas.cpp b/source/blender/freestyle/intern/application/AppCanvas.cpp
index b9f1d915e34..1f3aea65e24 100644
--- a/source/blender/freestyle/intern/application/AppCanvas.cpp
+++ b/source/blender/freestyle/intern/application/AppCanvas.cpp
@@ -18,6 +18,7 @@
* \ingroup freestyle
*/
+/* clang-format off */
#include "Controller.h"
#include "AppView.h"
#include "../image/Image.h"
@@ -28,7 +29,7 @@
#include "../stroke/StyleModule.h"
#include "../system/StringUtils.h"
-
+/* clang-format on */
namespace Freestyle {
AppCanvas::AppCanvas() : Canvas()
diff --git a/source/blender/freestyle/intern/application/AppConfig.h b/source/blender/freestyle/intern/application/AppConfig.h
index 9369ed81d50..725b29e7dd8 100644
--- a/source/blender/freestyle/intern/application/AppConfig.h
+++ b/source/blender/freestyle/intern/application/AppConfig.h
@@ -22,6 +22,7 @@
* \brief Configuration file
*/
+/* clang-format off */
#include <string>
#include <algorithm>
#include "../system/Precision.h"
@@ -29,6 +30,7 @@
#ifdef WITH_CXX_GUARDEDALLOC
# include "MEM_guardedalloc.h"
#endif
+/* clang-format on */
using namespace std;
diff --git a/source/blender/freestyle/intern/application/AppView.cpp b/source/blender/freestyle/intern/application/AppView.cpp
index e352e77f7ea..771d4b0fca8 100644
--- a/source/blender/freestyle/intern/application/AppView.cpp
+++ b/source/blender/freestyle/intern/application/AppView.cpp
@@ -18,6 +18,7 @@
* \ingroup freestyle
*/
+/* clang-format off */
#include <iostream>
#include "Controller.h"
@@ -45,6 +46,7 @@ extern "C" {
#include "FRS_freestyle.h"
}
+/* clang-format on */
namespace Freestyle {
diff --git a/source/blender/freestyle/intern/application/AppView.h b/source/blender/freestyle/intern/application/AppView.h
index deb099349cb..4c60b1515f3 100644
--- a/source/blender/freestyle/intern/application/AppView.h
+++ b/source/blender/freestyle/intern/application/AppView.h
@@ -21,6 +21,7 @@
* \ingroup freestyle
*/
+/* clang-format off */
#include "AppConfig.h"
#include "../geometry/Geom.h"
#include "../geometry/BBox.h"
@@ -32,6 +33,7 @@
#ifdef WITH_CXX_GUARDEDALLOC
# include "MEM_guardedalloc.h"
#endif
+/* clang-format on */
namespace Freestyle {
diff --git a/source/blender/freestyle/intern/application/Controller.cpp b/source/blender/freestyle/intern/application/Controller.cpp
index c852cda6c8c..f7da64624e0 100644
--- a/source/blender/freestyle/intern/application/Controller.cpp
+++ b/source/blender/freestyle/intern/application/Controller.cpp
@@ -18,6 +18,7 @@
* \ingroup freestyle
*/
+/* clang-format off */
extern "C" {
#include <Python.h>
}
@@ -69,6 +70,7 @@ extern "C" {
#include "DNA_freestyle_types.h"
#include "FRS_freestyle.h"
+/* clang-format off */
namespace Freestyle {