Commit: 85424397b1847d80d7a0b6bcbf7cb3c3aa3d0181
Author: Dalai Felinto
Date: Fri Mar 6 16:45:16 2020 +0100
Branches: master
https://developer.blender.org/rB85424397b1847d80d7a0b6bcbf7cb3c3aa3d0181
Cleanup: tweak Freestyle #includes in preparation for clang-format sorting
===================================================================
M source/blender/freestyle/FRS_precomp.h
M source/blender/freestyle/intern/application/AppCanvas.cpp
M source/blender/freestyle/intern/application/AppConfig.h
M source/blender/freestyle/intern/application/AppView.cpp
M source/blender/freestyle/intern/application/AppView.h
M source/blender/freestyle/intern/application/Controller.cpp
M source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h
M
source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
M source/blender/freestyle/intern/geometry/BBox.h
M source/blender/freestyle/intern/geometry/FitCurve.cpp
M source/blender/freestyle/intern/geometry/GeomCleaner.cpp
M source/blender/freestyle/intern/geometry/normal_cycle.cpp
M source/blender/freestyle/intern/stroke/Canvas.cpp
M source/blender/freestyle/intern/stroke/Chain.cpp
M source/blender/freestyle/intern/stroke/ChainingIterators.h
M source/blender/freestyle/intern/stroke/Curve.cpp
M source/blender/freestyle/intern/stroke/Operators.cpp
M source/blender/freestyle/intern/stroke/PSStrokeRenderer.cpp
M source/blender/freestyle/intern/stroke/Predicates1D.h
M source/blender/freestyle/intern/stroke/Stroke.cpp
M source/blender/freestyle/intern/stroke/StrokeLayer.cpp
M source/blender/freestyle/intern/stroke/StrokeRenderer.h
M source/blender/freestyle/intern/stroke/StrokeRep.cpp
M source/blender/freestyle/intern/stroke/StrokeTesselator.cpp
M source/blender/freestyle/intern/stroke/TextStrokeRenderer.h
M source/blender/freestyle/intern/system/PythonInterpreter.h
M source/blender/freestyle/intern/system/StringUtils.cpp
M source/blender/freestyle/intern/system/StringUtils.h
M source/blender/freestyle/intern/view_map/GridDensityProvider.h
M source/blender/freestyle/intern/view_map/SilhouetteGeomEngine.cpp
M source/blender/freestyle/intern/view_map/SphericalGrid.h
M source/blender/freestyle/intern/view_map/SteerableViewMap.cpp
M source/blender/freestyle/intern/view_map/ViewMap.cpp
M source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp
M source/blender/freestyle/intern/view_map/ViewMapTesselator.h
M source/blender/freestyle/intern/winged_edge/WFillGrid.cpp
M source/blender/freestyle/intern/winged_edge/WSFillGrid.cpp
M source/blender/freestyle/intern/winged_edge/WXEdgeBuilder.cpp
===================================================================
diff --git a/source/blender/freestyle/FRS_precomp.h
b/source/blender/freestyle/FRS_precomp.h
index 37b15ae4504..52f5b58aed0 100644
--- a/source/blender/freestyle/FRS_precomp.h
+++ b/source/blender/freestyle/FRS_precomp.h
@@ -1,4 +1,6 @@
/* Pre-compiled headers, see: D2606. */
+
+/* clang-format off */
#include <Python.h>
#include <pthread.h>
#include <string>
@@ -45,3 +47,5 @@
#include "intern/python/BPy_ViewMap.h"
#include "intern/python/BPy_ViewShape.h"
#include "intern/python/Director.h"
+
+/* clang-format on */
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 {
diff --git
a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h
b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h
index 7bdf607d981..fe93b179eb6 100644
--- a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h
+++ b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h
@@ -21,6 +21,7 @@
* \ingroup freestyle
*/
+/* clang-format off */
#include <string.h>
#include <float.h>
@@ -63,6 +64,7 @@ extern "C" {
#ifdef WITH_CXX_GUARDEDALLOC
# include "MEM_guardedalloc.h"
#endif
+/* clang-format on */
namespace Freestyle {
diff --git
a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
index 9073be55291..c88d5f24b5d 100644
---
a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
+++
b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
@@ -18,6 +18,7 @@
* \ingroup freestyle
*/
+/* clang-format off */
#include "BlenderStrokeRenderer.h"
#include "../application/AppConfig.h"
@@ -67,6 +68,7 @@ extern "C" {
}
#include <limits.h>
+/* clang-format on */
namespace Freestyle {
diff --git a/source/blender/freestyle/intern/geometry/BBox.h
b/source/blender/freestyle/intern/geometry/BBox.h
index 71384d33bc6..0031a7ce860 100644
--- a/source/blender/freestyle/intern/geometry/BBox.h
+++ b/source/blender/freestyle/intern/geometry/BBox.h
@@ -22,6 +22,7 @@
* \brief A class to hold a bounding box
*/
+/* clang-format off */
#include <stdlib.h>
#include <algorithm>
@@ -30,6 +31,7 @@
#ifdef WITH_CXX_GUARDEDALLOC
# include "MEM_guardedalloc.h"
#endif
+/* clang-format on */
namespace Freestyle {
diff --git a/source/blender/freestyle/intern/geometry/FitCurve.cpp
b/source/blender/freestyle/intern/geometry/FitCurve.cpp
index e7d67756535..bfc5e16aa2a 100644
--- a/source/blender/freestyle/intern/geometry/FitCurve.cpp
+++ b/source/blender/freestyle/intern/geometry/FitCurve.cpp
@@ -20,11 +20,13 @@
* \brief from "Graphics Gems", Academic Press, 1990
*/
+/* clang-format off */
#include <cstdlib> // for malloc and free
#include <stdio.h>
#include <math.h>
#include "FitCurve.h"
+/* clang-format on */
using namespace std;
diff --git a/source/blender/freestyle/intern/geometry/GeomCleaner.cpp
b/source/blender/freestyle/intern/geometry/GeomCleaner.cpp
index 9fb830c056c..a7db17a4015 100644
--- a/source/blender/freestyle/intern/geometry/GeomCleaner.cpp
+++ b/source/blender/freestyle/intern/geometry/GeomCleaner.cpp
@@ -19,6 +19,7 @@
* \brief Class to define a cleaner of geometry providing a set of useful tools
*/
+/* clang-format off */
#if 0
# if defined(__GNUC__) && (__GNUC__ >= 3)
// hash_map is not part of the C++ standard anymore;
@@ -38,6 +39,7 @@
#include "../system/TimeUtils.h"
#include "BKE_global.h"
+/* clang-format on */
using namespace std;
diff --git a/source/blender/freestyle/intern/geometry/normal_cycle.cpp
b/source/blender/freestyle/intern/geometry/normal_cycle.cpp
index 25a39619a04..5820bdc4865 100644
--- a/source/blender/freestyle/intern/geometry/normal_cycle.cpp
+++ b/source/blender/freestyle/intern/geometry/normal_cycle.cpp
@@ -29,8 +29,10 @@
* \ingroup freestyle
*/
+/* clang-format off */
#include "matrix_util.h"
#include "normal_cycle.h"
+/* clang-format on */
namespace Freestyle {
diff --git a/source/blender/freestyle/intern/stroke/Canvas.cpp
b/source/blender/freestyle/intern/stroke/Canvas.cpp
index 4cb00b18f60..8159279a846 100644
--- a/source/blender/freestyle/intern/stroke/Canvas.cpp
+++ b/source/blender/freestyle/intern/stroke/Canvas.cpp
@@ -19,6 +19,7 @@
* \brief Class to define a canvas designed to draw style modules
*/
+/* clang-format off */
#include <sstream>
#include <vector>
@@ -45,6 +46,7 @@ extern "C" {
#include "IMB_imbuf.h"
#include "IMB_imbuf_types.h"
}
+/* clang-format on */
using namespace std;
diff --git a/source/blender/freestyle/intern/stroke/Chain.cpp
b/source/blender/freestyle/intern/stroke/Chain.cpp
index 79d174d8117..94c0b753985 100644
--- a/source/blender/freestyle/intern/stroke/Chain.cpp
+++ b/source/blender/freestyle/intern/stroke/Chain.cpp
@@ -19,10 +19,12 @@
* \brief Class to define a chain of viewedges.
*/
+/* clang-format off */
#include "Chain.h"
#include "../view_map/ViewMapIterators.h"
#include "../view_map/ViewMapAdvancedIterators.h"
+/* clang-format on */
namespace Freestyle {
diff --git a/source/blender/freestyle/intern/stroke/ChainingIterators.h
b/source/blender/freestyle/intern/stroke/ChainingIterators.h
index 3cc322a2a4b..569ca6fcf1d 100644
--- a/source/blender/freestyle/intern/stroke/ChainingIterators.h
+++ b/source/blender/freestyle/intern/stroke/ChainingIterators.h
@@ -22,6 +22,7 @@
* \brief Chaining iterators
*/
+/* clang-format off */
#include <iostream>
#include "Predicates1D.h"
@@ -31,6 +32,7 @@
#include "../view_map/ViewMap.h"
#include "../view_map/ViewMapIterators.h"
#include "../view_map/ViewMapAdvancedIterators.h"
+/* clang-format on */
// using namespace ViewEdgeInternal;
diff --git a/source/blender/freestyle/intern/stroke/Curve.cpp
b/source/blender/freestyle/intern/stroke/Curve.cpp
index a5d87632ad3..294f332d48d 100644
--- a/source/blender/freestyle/intern/stroke/Curve.cpp
+++ b/source/blender/freestyle/intern/stroke/Curve.cpp
@@ -19,6 +19,7 @@
* \brief Class to define a container for curves
*/
+/* clang-format off */
#include <stdio.h> /* printf */
#include "Curve.h"
@@ -27,6 +28,7 @@
#include "BKE_global.h"
#include "BLI_utildefines.h"
+/* clang-format on */
namespace Freestyle {
diff --git a/source/blender/freestyle/intern/stroke/Operators.cpp
b/source/blender/freestyle/intern/stroke/Operators.cpp
index 84d2d3315f1..b0d3f26bce4 100644
--- a/source/blender/freestyle/intern/stroke/Operators.cpp
+++ b/source/blender/freestyle/intern/stroke/Operators.cpp
@@ -19,6 +19,7 @@
* \brief Class gathering stroke creation algorithms
*/
+/* clang-format off */
#include <algorithm>
#include <stdexcept>
@@ -29,6 +30,7 @@
#include "CurveIterators.h"
#include "BKE_global.h"
+/* clang-format on */
namespace Freestyle {
diff --git a/source/blender/freestyle/intern/stroke/PSStrokeRenderer.cpp
b/source/blender/freestyle/intern/stroke/PSStrokeRenderer.cpp
index 670388f5d52..ff43e5986b3 100644
--- a/source/blender/freestyle/intern/stroke/PSStrokeRenderer.cpp
+++ b/source/blender/freestyle/intern/stroke/PSStrokeRenderer.cpp
@@ -19,8 +19,10 @@
* \brief Class to define the Postscript rendering of a stroke
*/
+/* clang-format off */
#include "Canvas.h"
#include "PSStrokeRenderer.h"
+/* clang-format on */
namespace Freestyle {
diff --git a/source/blender/freestyle/intern/stroke/Predicates1D.h b/sou
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
