From 7ed7524c91a07756466cc235d476daf0c7100b72 Mon Sep 17 00:00:00 2001 From: Tamito Kajiyama Date: Wed, 7 Apr 2010 23:28:29 +0000 Subject: Got rid of a number of compiler warnings with regard to redefinitions of _POSIX_C_SOURCE and _XOPEN_SOURCE. There are no functional changes. Tested with GCC 4.4.1 on Ubuntu 9.10 (karmic). --- source/blender/freestyle/intern/application/AppCanvas.cpp | 3 +-- source/blender/freestyle/intern/application/AppView.cpp | 3 ++- source/blender/freestyle/intern/application/Controller.h | 2 +- .../intern/blender_interface/BlenderStrokeRenderer.h | 2 +- .../intern/blender_interface/BlenderTextureManager.h | 2 +- .../freestyle/intern/blender_interface/FRS_freestyle.cpp | 2 +- source/blender/freestyle/intern/python/BPy_BBox.h | 4 ++-- .../blender/freestyle/intern/python/BPy_BinaryPredicate0D.h | 4 ++-- .../blender/freestyle/intern/python/BPy_BinaryPredicate1D.h | 4 ++-- source/blender/freestyle/intern/python/BPy_ContextFunctions.h | 4 ++-- source/blender/freestyle/intern/python/BPy_Convert.h | 2 +- source/blender/freestyle/intern/python/BPy_Freestyle.h | 4 ++-- source/blender/freestyle/intern/python/BPy_FrsMaterial.h | 4 ++-- source/blender/freestyle/intern/python/BPy_FrsNoise.h | 4 ++-- source/blender/freestyle/intern/python/BPy_Id.h | 3 +-- source/blender/freestyle/intern/python/BPy_IntegrationType.h | 4 ++-- source/blender/freestyle/intern/python/BPy_Interface0D.h | 4 ++-- source/blender/freestyle/intern/python/BPy_Interface1D.h | 4 ++-- source/blender/freestyle/intern/python/BPy_Iterator.h | 4 ++-- source/blender/freestyle/intern/python/BPy_MediumType.h | 4 ++-- source/blender/freestyle/intern/python/BPy_Nature.h | 4 ++-- source/blender/freestyle/intern/python/BPy_Operators.h | 4 ++-- source/blender/freestyle/intern/python/BPy_SShape.h | 4 ++-- source/blender/freestyle/intern/python/BPy_StrokeAttribute.h | 4 ++-- source/blender/freestyle/intern/python/BPy_StrokeShader.h | 3 +-- source/blender/freestyle/intern/python/BPy_UnaryFunction0D.h | 4 ++-- source/blender/freestyle/intern/python/BPy_UnaryFunction1D.h | 4 ++-- source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.h | 4 ++-- source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.h | 4 ++-- source/blender/freestyle/intern/python/BPy_ViewMap.h | 4 ++-- source/blender/freestyle/intern/python/BPy_ViewShape.h | 4 ++-- source/blender/freestyle/intern/rendering/GLDebugRenderer.cpp | 4 ++-- source/blender/freestyle/intern/rendering/GLDebugRenderer.h | 2 +- source/blender/freestyle/intern/rendering/GLRenderer.cpp | 2 +- source/blender/freestyle/intern/rendering/GLStrokeRenderer.h | 2 +- source/blender/freestyle/intern/stroke/AdvancedFunctions1D.h | 2 +- .../blender/freestyle/intern/stroke/AdvancedStrokeShaders.cpp | 2 +- source/blender/freestyle/intern/stroke/BasicStrokeShaders.cpp | 2 +- source/blender/freestyle/intern/stroke/Canvas.cpp | 2 +- source/blender/freestyle/intern/stroke/ChainingIterators.h | 2 +- source/blender/freestyle/intern/stroke/Curve.h | 2 +- source/blender/freestyle/intern/stroke/Operators.cpp | 2 +- source/blender/freestyle/intern/stroke/Operators.h | 2 +- source/blender/freestyle/intern/stroke/PSStrokeRenderer.h | 2 +- source/blender/freestyle/intern/stroke/Stroke.h | 2 +- source/blender/freestyle/intern/stroke/StrokeIO.h | 2 +- source/blender/freestyle/intern/stroke/StrokeLayer.cpp | 2 +- source/blender/freestyle/intern/stroke/StrokeRenderer.h | 2 +- source/blender/freestyle/intern/stroke/StrokeRep.cpp | 2 +- source/blender/freestyle/intern/stroke/StrokeTesselator.cpp | 2 +- source/blender/freestyle/intern/stroke/StrokeTesselator.h | 2 +- source/blender/freestyle/intern/stroke/TextStrokeRenderer.h | 2 +- source/blender/freestyle/intern/system/PythonInterpreter.h | 2 +- source/blender/freestyle/intern/view_map/Functions1D.h | 4 ++-- source/blender/freestyle/intern/view_map/Interface0D.h | 11 +---------- source/blender/freestyle/intern/view_map/Interface1D.h | 11 +---------- source/blender/freestyle/intern/view_map/Silhouette.h | 4 ++-- .../freestyle/intern/view_map/SilhouetteGeomEngine.cpp | 2 +- source/blender/freestyle/intern/view_map/SteerableViewMap.cpp | 2 +- source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.cpp | 2 +- source/blender/freestyle/intern/view_map/ViewMap.h | 6 +++--- source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp | 2 +- source/blender/freestyle/intern/view_map/ViewMapBuilder.h | 2 +- source/blender/freestyle/intern/view_map/ViewMapIO.h | 2 +- source/blender/freestyle/intern/view_map/ViewMapTesselator.h | 4 ++-- 65 files changed, 94 insertions(+), 114 deletions(-) (limited to 'source') diff --git a/source/blender/freestyle/intern/application/AppCanvas.cpp b/source/blender/freestyle/intern/application/AppCanvas.cpp index 986830292c9..3844cf2195a 100755 --- a/source/blender/freestyle/intern/application/AppCanvas.cpp +++ b/source/blender/freestyle/intern/application/AppCanvas.cpp @@ -19,12 +19,11 @@ // /////////////////////////////////////////////////////////////////////////////// +#include "Controller.h" #include "../rendering/GLBlendEquation.h" - #include "AppView.h" #include "../image/Image.h" #include "../system/TimeStamp.h" -#include "Controller.h" #include "../stroke/StrokeRenderer.h" #include "AppCanvas.h" #include "../rendering/GLRenderer.h" diff --git a/source/blender/freestyle/intern/application/AppView.cpp b/source/blender/freestyle/intern/application/AppView.cpp index 886fa31bc93..e523a89b445 100644 --- a/source/blender/freestyle/intern/application/AppView.cpp +++ b/source/blender/freestyle/intern/application/AppView.cpp @@ -19,6 +19,8 @@ // /////////////////////////////////////////////////////////////////////////////// +#include "Controller.h" + extern "C" { #include "BLI_jitter.h" } @@ -27,7 +29,6 @@ extern "C" { #include "../stroke/Canvas.h" #include "AppView.h" #include "../scene_graph/NodeLight.h" -#include "Controller.h" #include "../view_map/Silhouette.h" #include "../view_map/ViewMap.h" #include "../scene_graph/LineRep.h" diff --git a/source/blender/freestyle/intern/application/Controller.h b/source/blender/freestyle/intern/application/Controller.h index deeabb6da0a..422707d3c1f 100755 --- a/source/blender/freestyle/intern/application/Controller.h +++ b/source/blender/freestyle/intern/application/Controller.h @@ -30,11 +30,11 @@ #ifndef CONTROLLER_H # define CONTROLLER_H +# include "../view_map/ViewMapBuilder.h" # include //# include "ConfigIO.h" # include "../geometry/FastGrid.h" # include "../geometry/HashGrid.h" -# include "../view_map/ViewMapBuilder.h" # include "../system/TimeUtils.h" # include "../system/ProgressBar.h" # include "../system/Precision.h" diff --git a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.h b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.h index 38f498ead6f..40d87ce53a1 100644 --- a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.h +++ b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.h @@ -1,8 +1,8 @@ #ifndef BLENDERSTROKERENDERER_H # define BLENDERSTROKERENDERER_H -# include "../system/FreestyleConfig.h" # include "../stroke/StrokeRenderer.h" +# include "../system/FreestyleConfig.h" #ifdef __cplusplus extern "C" { diff --git a/source/blender/freestyle/intern/blender_interface/BlenderTextureManager.h b/source/blender/freestyle/intern/blender_interface/BlenderTextureManager.h index d49ab9cf008..fac33c139e1 100644 --- a/source/blender/freestyle/intern/blender_interface/BlenderTextureManager.h +++ b/source/blender/freestyle/intern/blender_interface/BlenderTextureManager.h @@ -1,9 +1,9 @@ #ifndef BLENDERTEXTUREMANAGER_H #define BLENDERTEXTUREMANAGER_H -# include "../system/FreestyleConfig.h" # include "../stroke/StrokeRenderer.h" # include "../stroke/StrokeRep.h" +# include "../system/FreestyleConfig.h" /*! Class to load textures */ diff --git a/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp b/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp index 1c2993f7297..1b22e1003d3 100644 --- a/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp +++ b/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp @@ -1,5 +1,5 @@ -#include "../application/AppView.h" #include "../application/Controller.h" +#include "../application/AppView.h" #include "../application/AppConfig.h" #include "../application/AppCanvas.h" diff --git a/source/blender/freestyle/intern/python/BPy_BBox.h b/source/blender/freestyle/intern/python/BPy_BBox.h index 96a61e18c2f..f8282187da0 100644 --- a/source/blender/freestyle/intern/python/BPy_BBox.h +++ b/source/blender/freestyle/intern/python/BPy_BBox.h @@ -1,6 +1,8 @@ #ifndef FREESTYLE_PYTHON_BBOX_H #define FREESTYLE_PYTHON_BBOX_H +#include + #include "../geometry/BBox.h" #include "../geometry/Geom.h" using namespace Geometry; @@ -11,8 +13,6 @@ extern "C" { /////////////////////////////////////////////////////////////////////////////////////////// -#include - extern PyTypeObject BBox_Type; #define BPy_BBox_Check(v) ( PyObject_IsInstance( (PyObject *) v, (PyObject *) &BBox_Type) ) diff --git a/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.h b/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.h index d27b6cc0fe8..6a9a0775608 100644 --- a/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.h +++ b/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.h @@ -1,6 +1,8 @@ #ifndef FREESTYLE_PYTHON_BINARYPREDICATE0D_H #define FREESTYLE_PYTHON_BINARYPREDICATE0D_H +#include + #include "../stroke/Predicates0D.h" #ifdef __cplusplus @@ -9,8 +11,6 @@ extern "C" { /////////////////////////////////////////////////////////////////////////////////////////// -#include - extern PyTypeObject BinaryPredicate0D_Type; #define BPy_BinaryPredicate0D_Check(v) ( PyObject_IsInstance( (PyObject *) v, (PyObject *) &BinaryPredicate0D_Type) ) diff --git a/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.h b/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.h index 42419ce7129..5a993f84f5b 100644 --- a/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.h +++ b/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.h @@ -1,6 +1,8 @@ #ifndef FREESTYLE_PYTHON_BINARYPREDICATE1D_H #define FREESTYLE_PYTHON_BINARYPREDICATE1D_H +#include + #include "../stroke/Predicates1D.h" #ifdef __cplusplus @@ -9,8 +11,6 @@ extern "C" { /////////////////////////////////////////////////////////////////////////////////////////// -#include - extern PyTypeObject BinaryPredicate1D_Type; #define BPy_BinaryPredicate1D_Check(v) ( PyObject_IsInstance( (PyObject *) v, (PyObject *) &BinaryPredicate1D_Type) ) diff --git a/source/blender/freestyle/intern/python/BPy_ContextFunctions.h b/source/blender/freestyle/intern/python/BPy_ContextFunctions.h index 5ec70f1a261..fafeff3e974 100644 --- a/source/blender/freestyle/intern/python/BPy_ContextFunctions.h +++ b/source/blender/freestyle/intern/python/BPy_ContextFunctions.h @@ -1,12 +1,12 @@ #ifndef FREESTYLE_PYTHON_CONTEXTFUNCTIONS_H #define FREESTYLE_PYTHON_CONTEXTFUNCTIONS_H +#include + #ifdef __cplusplus extern "C" { #endif -#include - /*---------------------------Python BPy_ContextFunctions visible prototypes-----------*/ int ContextFunctions_Init( PyObject *module ); diff --git a/source/blender/freestyle/intern/python/BPy_Convert.h b/source/blender/freestyle/intern/python/BPy_Convert.h index 3c0ada2ce76..1e861e23c78 100644 --- a/source/blender/freestyle/intern/python/BPy_Convert.h +++ b/source/blender/freestyle/intern/python/BPy_Convert.h @@ -1,6 +1,7 @@ #ifndef FREESTYLE_PYTHON_CONVERT_H #define FREESTYLE_PYTHON_CONVERT_H +#include #include #include "../geometry/Geom.h" @@ -61,7 +62,6 @@ extern "C" { /////////////////////////////////////////////////////////////////////////////////////////// -#include #include "generic/Mathutils.h" //============================== diff --git a/source/blender/freestyle/intern/python/BPy_Freestyle.h b/source/blender/freestyle/intern/python/BPy_Freestyle.h index 4a280cee5af..8ade4b5ff4d 100644 --- a/source/blender/freestyle/intern/python/BPy_Freestyle.h +++ b/source/blender/freestyle/intern/python/BPy_Freestyle.h @@ -1,14 +1,14 @@ #ifndef FREESTYLE_PYTHON_FREESTYLE_H #define FREESTYLE_PYTHON_FREESTYLE_H +#include + #ifdef __cplusplus extern "C" { #endif /////////////////////////////////////////////////////////////////////////////////////////// -#include - /*---------------------------Python BPy_Freestyle visible prototypes-----------*/ PyObject *Freestyle_Init( void ); diff --git a/source/blender/freestyle/intern/python/BPy_FrsMaterial.h b/source/blender/freestyle/intern/python/BPy_FrsMaterial.h index 01bdabc09d9..f541e1bb529 100644 --- a/source/blender/freestyle/intern/python/BPy_FrsMaterial.h +++ b/source/blender/freestyle/intern/python/BPy_FrsMaterial.h @@ -1,6 +1,8 @@ #ifndef FREESTYLE_PYTHON_FRSMATERIAL_H #define FREESTYLE_PYTHON_FRSMATERIAL_H +#include + #include "../scene_graph/FrsMaterial.h" #ifdef __cplusplus @@ -9,8 +11,6 @@ extern "C" { /////////////////////////////////////////////////////////////////////////////////////////// -#include - extern PyTypeObject FrsMaterial_Type; #define BPy_FrsMaterial_Check(v) ( PyObject_IsInstance( (PyObject *) v, (PyObject *) &FrsMaterial_Type) ) diff --git a/source/blender/freestyle/intern/python/BPy_FrsNoise.h b/source/blender/freestyle/intern/python/BPy_FrsNoise.h index 9b06ea0c37d..00b4f3375bc 100644 --- a/source/blender/freestyle/intern/python/BPy_FrsNoise.h +++ b/source/blender/freestyle/intern/python/BPy_FrsNoise.h @@ -1,6 +1,8 @@ #ifndef FREESTYLE_PYTHON_FRSNOISE_H #define FREESTYLE_PYTHON_FRSNOISE_H +#include + #include "../geometry/Noise.h" #ifdef __cplusplus @@ -9,8 +11,6 @@ extern "C" { /////////////////////////////////////////////////////////////////////////////////////////// -#include - extern PyTypeObject FrsNoise_Type; #define BPy_FrsNoise_Check(v) ( PyObject_IsInstance( (PyObject *) v, (PyObject *) &FrsNoise_Type) ) diff --git a/source/blender/freestyle/intern/python/BPy_Id.h b/source/blender/freestyle/intern/python/BPy_Id.h index 3063334f075..10f370f8a80 100644 --- a/source/blender/freestyle/intern/python/BPy_Id.h +++ b/source/blender/freestyle/intern/python/BPy_Id.h @@ -1,6 +1,7 @@ #ifndef FREESTYLE_PYTHON_ID_H #define FREESTYLE_PYTHON_ID_H +#include #include using namespace std; @@ -12,8 +13,6 @@ extern "C" { /////////////////////////////////////////////////////////////////////////////////////////// -#include - extern PyTypeObject Id_Type; #define BPy_Id_Check(v) ( PyObject_IsInstance( (PyObject *) v, (PyObject *) &Id_Type) ) diff --git a/source/blender/freestyle/intern/python/BPy_IntegrationType.h b/source/blender/freestyle/intern/python/BPy_IntegrationType.h index 176d8750c45..f15ae8309e3 100644 --- a/source/blender/freestyle/intern/python/BPy_IntegrationType.h +++ b/source/blender/freestyle/intern/python/BPy_IntegrationType.h @@ -1,6 +1,8 @@ #ifndef FREESTYLE_PYTHON_INTEGRATIONTYPE_H #define FREESTYLE_PYTHON_INTEGRATIONTYPE_H +#include + #include "../view_map/Interface1D.h" #ifdef __cplusplus @@ -9,8 +11,6 @@ extern "C" { /////////////////////////////////////////////////////////////////////////////////////////// -#include - extern PyTypeObject IntegrationType_Type; #define BPy_IntegrationType_Check(v) ( PyObject_IsInstance( (PyObject *) v, (PyObject *) &IntegrationType_Type) ) diff --git a/source/blender/freestyle/intern/python/BPy_Interface0D.h b/source/blender/freestyle/intern/python/BPy_Interface0D.h index cd8a8e19749..25134db5352 100644 --- a/source/blender/freestyle/intern/python/BPy_Interface0D.h +++ b/source/blender/freestyle/intern/python/BPy_Interface0D.h @@ -1,6 +1,8 @@ #ifndef FREESTYLE_PYTHON_INTERFACE0D_H #define FREESTYLE_PYTHON_INTERFACE0D_H +#include + #include "../view_map/Interface0D.h" #ifdef __cplusplus @@ -9,8 +11,6 @@ extern "C" { /////////////////////////////////////////////////////////////////////////////////////////// -#include - extern PyTypeObject Interface0D_Type; #define BPy_Interface0D_Check(v) ( PyObject_IsInstance( (PyObject *) v, (PyObject *) &Interface0D_Type) ) diff --git a/source/blender/freestyle/intern/python/BPy_Interface1D.h b/source/blender/freestyle/intern/python/BPy_Interface1D.h index f82b80e20eb..75eefa1836f 100644 --- a/source/blender/freestyle/intern/python/BPy_Interface1D.h +++ b/source/blender/freestyle/intern/python/BPy_Interface1D.h @@ -1,6 +1,8 @@ #ifndef FREESTYLE_PYTHON_INTERFACE1D_H #define FREESTYLE_PYTHON_INTERFACE1D_H +#include + #include "../view_map/Interface1D.h" #ifdef __cplusplus @@ -9,8 +11,6 @@ extern "C" { /////////////////////////////////////////////////////////////////////////////////////////// -#include - extern PyTypeObject Interface1D_Type; #define BPy_Interface1D_Check(v) ( PyObject_IsInstance( (PyObject *) v, (PyObject *) &Interface1D_Type) ) diff --git a/source/blender/freestyle/intern/python/BPy_Iterator.h b/source/blender/freestyle/intern/python/BPy_Iterator.h index 162df60d91e..0bdb52ef9a5 100644 --- a/source/blender/freestyle/intern/python/BPy_Iterator.h +++ b/source/blender/freestyle/intern/python/BPy_Iterator.h @@ -1,6 +1,8 @@ #ifndef FREESTYLE_PYTHON_ITERATOR_H #define FREESTYLE_PYTHON_ITERATOR_H +#include + #include "../system/Iterator.h" #ifdef __cplusplus @@ -9,8 +11,6 @@ extern "C" { /////////////////////////////////////////////////////////////////////////////////////////// -#include - extern PyTypeObject Iterator_Type; #define BPy_Iterator_Check(v) ( PyObject_IsInstance( (PyObject *) v, (PyObject *) &Iterator_Type) ) diff --git a/source/blender/freestyle/intern/python/BPy_MediumType.h b/source/blender/freestyle/intern/python/BPy_MediumType.h index 94bc7aa954c..3bc50477295 100644 --- a/source/blender/freestyle/intern/python/BPy_MediumType.h +++ b/source/blender/freestyle/intern/python/BPy_MediumType.h @@ -1,6 +1,8 @@ #ifndef FREESTYLE_PYTHON_MEDIUMTYPE_H #define FREESTYLE_PYTHON_MEDIUMTYPE_H +#include + #include "../stroke/Stroke.h" #ifdef __cplusplus @@ -9,8 +11,6 @@ extern "C" { /////////////////////////////////////////////////////////////////////////////////////////// -#include - extern PyTypeObject MediumType_Type; #define BPy_MediumType_Check(v) ( PyObject_IsInstance( (PyObject *) v, (PyObject *) &MediumType_Type) ) diff --git a/source/blender/freestyle/intern/python/BPy_Nature.h b/source/blender/freestyle/intern/python/BPy_Nature.h index d5e1c9c63d4..8c38415242e 100644 --- a/source/blender/freestyle/intern/python/BPy_Nature.h +++ b/source/blender/freestyle/intern/python/BPy_Nature.h @@ -1,6 +1,8 @@ #ifndef FREESTYLE_PYTHON_NATURE_H #define FREESTYLE_PYTHON_NATURE_H +#include + #include "../winged_edge/Nature.h" #ifdef __cplusplus @@ -9,8 +11,6 @@ extern "C" { /////////////////////////////////////////////////////////////////////////////////////////// -#include - extern PyTypeObject Nature_Type; #define BPy_Nature_Check(v) ( PyObject_IsInstance( (PyObject *) v, (PyObject *) &Nature_Type) ) diff --git a/source/blender/freestyle/intern/python/BPy_Operators.h b/source/blender/freestyle/intern/python/BPy_Operators.h index c6b088415c4..5e01d6bb1fe 100644 --- a/source/blender/freestyle/intern/python/BPy_Operators.h +++ b/source/blender/freestyle/intern/python/BPy_Operators.h @@ -1,6 +1,8 @@ #ifndef FREESTYLE_PYTHON_OPERATORS_H #define FREESTYLE_PYTHON_OPERATORS_H +#include + #include "../stroke/Operators.h" #ifdef __cplusplus @@ -9,8 +11,6 @@ extern "C" { /////////////////////////////////////////////////////////////////////////////////////////// -#include - extern PyTypeObject Operators_Type; #define BPy_Operators_Check(v) ( PyObject_IsInstance( (PyObject *) v, (PyObject *) &Operators_Type) ) diff --git a/source/blender/freestyle/intern/python/BPy_SShape.h b/source/blender/freestyle/intern/python/BPy_SShape.h index 3bcb6a60603..e8d631f0538 100644 --- a/source/blender/freestyle/intern/python/BPy_SShape.h +++ b/source/blender/freestyle/intern/python/BPy_SShape.h @@ -1,6 +1,8 @@ #ifndef FREESTYLE_PYTHON_SSHAPE_H #define FREESTYLE_PYTHON_SSHAPE_H +#include + #include "../view_map/Silhouette.h" #ifdef __cplusplus @@ -9,8 +11,6 @@ extern "C" { /////////////////////////////////////////////////////////////////////////////////////////// -#include - extern PyTypeObject SShape_Type; #define BPy_SShape_Check(v) ( PyObject_IsInstance( (PyObject *) v, (PyObject *) &SShape_Type) ) diff --git a/source/blender/freestyle/intern/python/BPy_StrokeAttribute.h b/source/blender/freestyle/intern/python/BPy_StrokeAttribute.h index a2193c681aa..51e18c0a96f 100644 --- a/source/blender/freestyle/intern/python/BPy_StrokeAttribute.h +++ b/source/blender/freestyle/intern/python/BPy_StrokeAttribute.h @@ -1,6 +1,8 @@ #ifndef FREESTYLE_PYTHON_STROKEATTRIBUTE_H #define FREESTYLE_PYTHON_STROKEATTRIBUTE_H +#include + #include "../stroke/Stroke.h" #ifdef __cplusplus @@ -9,8 +11,6 @@ extern "C" { /////////////////////////////////////////////////////////////////////////////////////////// -#include - extern PyTypeObject StrokeAttribute_Type; #define BPy_StrokeAttribute_Check(v) ( PyObject_IsInstance( (PyObject *) v, (PyObject *) &StrokeAttribute_Type) ) diff --git a/source/blender/freestyle/intern/python/BPy_StrokeShader.h b/source/blender/freestyle/intern/python/BPy_StrokeShader.h index e1d72cef546..baa31a3100e 100644 --- a/source/blender/freestyle/intern/python/BPy_StrokeShader.h +++ b/source/blender/freestyle/intern/python/BPy_StrokeShader.h @@ -1,6 +1,7 @@ #ifndef FREESTYLE_PYTHON_STROKESHADER_H #define FREESTYLE_PYTHON_STROKESHADER_H +#include #include "../system/FreestyleConfig.h" @@ -14,8 +15,6 @@ extern "C" { /////////////////////////////////////////////////////////////////////////////////////////// -#include - extern PyTypeObject StrokeShader_Type; #define BPy_StrokeShader_Check(v) ( PyObject_IsInstance( (PyObject *) v, (PyObject *) &StrokeShader_Type) ) diff --git a/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.h b/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.h index d9215e3275f..6d61c336662 100644 --- a/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.h +++ b/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.h @@ -1,6 +1,8 @@ #ifndef FREESTYLE_PYTHON_UNARYFUNCTION0D_H #define FREESTYLE_PYTHON_UNARYFUNCTION0D_H +#include + #include "../view_map/Functions0D.h" #ifdef __cplusplus @@ -9,8 +11,6 @@ extern "C" { /////////////////////////////////////////////////////////////////////////////////////////// -#include - extern PyTypeObject UnaryFunction0D_Type; #define BPy_UnaryFunction0D_Check(v) ( PyObject_IsInstance( (PyObject *) v, (PyObject *) &UnaryFunction0D_Type) ) diff --git a/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.h b/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.h index b8d92ba649d..cb9df18ab75 100644 --- a/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.h +++ b/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.h @@ -1,6 +1,8 @@ #ifndef FREESTYLE_PYTHON_UNARYFUNCTION1D_H #define FREESTYLE_PYTHON_UNARYFUNCTION1D_H +#include + #include "../view_map/Functions1D.h" #ifdef __cplusplus @@ -9,8 +11,6 @@ extern "C" { /////////////////////////////////////////////////////////////////////////////////////////// -#include - extern PyTypeObject UnaryFunction1D_Type; #define BPy_UnaryFunction1D_Check(v) ( PyObject_IsInstance( (PyObject *) v, (PyObject *) &UnaryFunction1D_Type) ) diff --git a/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.h b/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.h index a3b56d39594..9f9bb0c1003 100644 --- a/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.h +++ b/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.h @@ -1,6 +1,8 @@ #ifndef FREESTYLE_PYTHON_UNARYPREDICATE0D_H #define FREESTYLE_PYTHON_UNARYPREDICATE0D_H +#include + #include "../stroke/Predicates0D.h" #ifdef __cplusplus @@ -9,8 +11,6 @@ extern "C" { /////////////////////////////////////////////////////////////////////////////////////////// -#include - extern PyTypeObject UnaryPredicate0D_Type; #define BPy_UnaryPredicate0D_Check(v) ( PyObject_IsInstance( (PyObject *) v, (PyObject *) &UnaryPredicate0D_Type) ) diff --git a/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.h b/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.h index f23b2e0d25f..75953e7977b 100644 --- a/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.h +++ b/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.h @@ -1,6 +1,8 @@ #ifndef FREESTYLE_PYTHON_UNARYPREDICATE1D_H #define FREESTYLE_PYTHON_UNARYPREDICATE1D_H +#include + #include "../stroke/Predicates1D.h" #ifdef __cplusplus @@ -9,8 +11,6 @@ extern "C" { /////////////////////////////////////////////////////////////////////////////////////////// -#include - extern PyTypeObject UnaryPredicate1D_Type; #define BPy_UnaryPredicate1D_Check(v) ( PyObject_IsInstance( (PyObject *) v, (PyObject *) &UnaryPredicate1D_Type) ) diff --git a/source/blender/freestyle/intern/python/BPy_ViewMap.h b/source/blender/freestyle/intern/python/BPy_ViewMap.h index f1966e5c71e..943aeb718fc 100644 --- a/source/blender/freestyle/intern/python/BPy_ViewMap.h +++ b/source/blender/freestyle/intern/python/BPy_ViewMap.h @@ -1,6 +1,8 @@ #ifndef FREESTYLE_PYTHON_VIEWMAP_H #define FREESTYLE_PYTHON_VIEWMAP_H +#include + #include "../view_map/ViewMap.h" #ifdef __cplusplus @@ -9,8 +11,6 @@ extern "C" { /////////////////////////////////////////////////////////////////////////////////////////// -#include - extern PyTypeObject ViewMap_Type; #define BPy_ViewMap_Check(v) ( PyObject_IsInstance( (PyObject *) v, (PyObject *) &ViewMap_Type) ) diff --git a/source/blender/freestyle/intern/python/BPy_ViewShape.h b/source/blender/freestyle/intern/python/BPy_ViewShape.h index e88ab090b47..1850ec8f13a 100644 --- a/source/blender/freestyle/intern/python/BPy_ViewShape.h +++ b/source/blender/freestyle/intern/python/BPy_ViewShape.h @@ -1,6 +1,8 @@ #ifndef FREESTYLE_PYTHON_VIEWSHAPE_H #define FREESTYLE_PYTHON_VIEWSHAPE_H +#include + #include "../view_map/ViewMap.h" #ifdef __cplusplus @@ -9,8 +11,6 @@ extern "C" { /////////////////////////////////////////////////////////////////////////////////////////// -#include - extern PyTypeObject ViewShape_Type; #define BPy_ViewShape_Check(v) ( PyObject_IsInstance( (PyObject *) v, (PyObject *) &ViewShape_Type) ) diff --git a/source/blender/freestyle/intern/rendering/GLDebugRenderer.cpp b/source/blender/freestyle/intern/rendering/GLDebugRenderer.cpp index b3b77bb3ed8..12428ab633f 100755 --- a/source/blender/freestyle/intern/rendering/GLDebugRenderer.cpp +++ b/source/blender/freestyle/intern/rendering/GLDebugRenderer.cpp @@ -19,6 +19,8 @@ // /////////////////////////////////////////////////////////////////////////////// +#include "GLDebugRenderer.h" + #include #include "../scene_graph/VertexRep.h" #include "../scene_graph/NodeShape.h" @@ -26,8 +28,6 @@ #include "../scene_graph/LineRep.h" #include "../geometry/Grid.h" -#include "GLDebugRenderer.h" - #ifdef __MACH__ #include #else diff --git a/source/blender/freestyle/intern/rendering/GLDebugRenderer.h b/source/blender/freestyle/intern/rendering/GLDebugRenderer.h index 9111d5067bc..45316b3abc6 100755 --- a/source/blender/freestyle/intern/rendering/GLDebugRenderer.h +++ b/source/blender/freestyle/intern/rendering/GLDebugRenderer.h @@ -31,10 +31,10 @@ #ifndef GLDEBUGRENDERER_H # define GLDEBUGRENDERER_H +# include "../view_map/Silhouette.h" # include # include "../system/FreestyleConfig.h" # include "GLRenderer.h" -# include "../view_map/Silhouette.h" # include "../winged_edge/Curvature.h" class WSMeshShape; diff --git a/source/blender/freestyle/intern/rendering/GLRenderer.cpp b/source/blender/freestyle/intern/rendering/GLRenderer.cpp index 678256f72bf..75901e09c2b 100755 --- a/source/blender/freestyle/intern/rendering/GLRenderer.cpp +++ b/source/blender/freestyle/intern/rendering/GLRenderer.cpp @@ -19,6 +19,7 @@ // /////////////////////////////////////////////////////////////////////////////// +#include "../stroke/Stroke.h" #include "../scene_graph/IndexedFaceSet.h" #include "../scene_graph/NodeDrawingStyle.h" #include "../scene_graph/NodeLight.h" @@ -27,7 +28,6 @@ #include "../scene_graph/NodeShape.h" #include "../scene_graph/OrientedLineRep.h" #include "../scene_graph/VertexRep.h" -#include "../stroke/Stroke.h" #include "../scene_graph/TriangleRep.h" diff --git a/source/blender/freestyle/intern/rendering/GLStrokeRenderer.h b/source/blender/freestyle/intern/rendering/GLStrokeRenderer.h index 345a4273350..70289924002 100755 --- a/source/blender/freestyle/intern/rendering/GLStrokeRenderer.h +++ b/source/blender/freestyle/intern/rendering/GLStrokeRenderer.h @@ -30,9 +30,9 @@ #ifndef GLSTROKERENDERER_H # define GLSTROKERENDERER_H -# include "../system/FreestyleConfig.h" # include "../stroke/StrokeRenderer.h" # include "../stroke/StrokeRep.h" +# include "../system/FreestyleConfig.h" #include "GLBlendEquation.h" diff --git a/source/blender/freestyle/intern/stroke/AdvancedFunctions1D.h b/source/blender/freestyle/intern/stroke/AdvancedFunctions1D.h index 46a28c20917..ab963c68034 100755 --- a/source/blender/freestyle/intern/stroke/AdvancedFunctions1D.h +++ b/source/blender/freestyle/intern/stroke/AdvancedFunctions1D.h @@ -31,8 +31,8 @@ # define ADVANCED_FUNCTIONS1D_HPP -# include "AdvancedFunctions0D.h" # include "../view_map/Functions1D.h" +# include "AdvancedFunctions0D.h" // // Functions definitions diff --git a/source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.cpp b/source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.cpp index 2075f7ca6ad..05da47914f3 100755 --- a/source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.cpp +++ b/source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.cpp @@ -19,9 +19,9 @@ // /////////////////////////////////////////////////////////////////////////////// +#include "AdvancedStrokeShaders.h" #include "../system/PseudoNoise.h" #include "../system/RandGen.h" -#include "AdvancedStrokeShaders.h" #include "StrokeIterators.h" ///////////////////////////////////////// diff --git a/source/blender/freestyle/intern/stroke/BasicStrokeShaders.cpp b/source/blender/freestyle/intern/stroke/BasicStrokeShaders.cpp index 828c13338ae..bc9edcef057 100755 --- a/source/blender/freestyle/intern/stroke/BasicStrokeShaders.cpp +++ b/source/blender/freestyle/intern/stroke/BasicStrokeShaders.cpp @@ -19,6 +19,7 @@ // /////////////////////////////////////////////////////////////////////////////// +#include "StrokeRenderer.h" #include #include "BasicStrokeShaders.h" #include "../system/PseudoNoise.h" @@ -29,7 +30,6 @@ #include "AdvancedFunctions1D.h" #include "StrokeIterators.h" #include "../system/StringUtils.h" -#include "StrokeRenderer.h" #include "StrokeIO.h" //soc #include diff --git a/source/blender/freestyle/intern/stroke/Canvas.cpp b/source/blender/freestyle/intern/stroke/Canvas.cpp index 7be2b54a036..c1843b7a6c1 100755 --- a/source/blender/freestyle/intern/stroke/Canvas.cpp +++ b/source/blender/freestyle/intern/stroke/Canvas.cpp @@ -19,9 +19,9 @@ // /////////////////////////////////////////////////////////////////////////////// +#include "StrokeRenderer.h" #include #include "../system/FreestyleConfig.h" -#include "StrokeRenderer.h" #include "../system/TimeStamp.h" #include "../system/PseudoNoise.h" #include "Canvas.h" diff --git a/source/blender/freestyle/intern/stroke/ChainingIterators.h b/source/blender/freestyle/intern/stroke/ChainingIterators.h index ec093888aea..fec8d5ab6dc 100755 --- a/source/blender/freestyle/intern/stroke/ChainingIterators.h +++ b/source/blender/freestyle/intern/stroke/ChainingIterators.h @@ -28,10 +28,10 @@ #ifndef CHAININGITERATORS_H # define CHAININGITERATORS_H -# include # include "../view_map/ViewMap.h" # include "../view_map/ViewMapIterators.h" # include "../view_map/ViewMapAdvancedIterators.h" +# include # include "Predicates1D.h" #include "../system/Iterator.h" //soc diff --git a/source/blender/freestyle/intern/stroke/Curve.h b/source/blender/freestyle/intern/stroke/Curve.h index 52a0dda1f17..60bc9815cb4 100755 --- a/source/blender/freestyle/intern/stroke/Curve.h +++ b/source/blender/freestyle/intern/stroke/Curve.h @@ -30,11 +30,11 @@ #ifndef CURVE_H # define CURVE_H +# include "../view_map/Silhouette.h" # include # include "../system/BaseIterator.h" # include "../geometry/Geom.h" //# include "../scene_graph/FrsMaterial.h" -# include "../view_map/Silhouette.h" # include "../view_map/SilhouetteGeomEngine.h" # include "../view_map/Interface0D.h" # include "../view_map/Interface1D.h" diff --git a/source/blender/freestyle/intern/stroke/Operators.cpp b/source/blender/freestyle/intern/stroke/Operators.cpp index 950c9570f0e..ef1b2662998 100755 --- a/source/blender/freestyle/intern/stroke/Operators.cpp +++ b/source/blender/freestyle/intern/stroke/Operators.cpp @@ -19,9 +19,9 @@ // /////////////////////////////////////////////////////////////////////////////// +#include "Operators.h" #include #include -#include "Operators.h" #include "Canvas.h" #include "Stroke.h" diff --git a/source/blender/freestyle/intern/stroke/Operators.h b/source/blender/freestyle/intern/stroke/Operators.h index cff9e120c1a..d705d5af5b2 100755 --- a/source/blender/freestyle/intern/stroke/Operators.h +++ b/source/blender/freestyle/intern/stroke/Operators.h @@ -30,9 +30,9 @@ #ifndef OPERATORS_H # define OPERATORS_H +# include "../view_map/Interface1D.h" # include # include -# include "../view_map/Interface1D.h" # include "Predicates1D.h" # include "Predicates0D.h" # include "../view_map/ViewMap.h" diff --git a/source/blender/freestyle/intern/stroke/PSStrokeRenderer.h b/source/blender/freestyle/intern/stroke/PSStrokeRenderer.h index 821c016ab91..b30949845ab 100755 --- a/source/blender/freestyle/intern/stroke/PSStrokeRenderer.h +++ b/source/blender/freestyle/intern/stroke/PSStrokeRenderer.h @@ -30,8 +30,8 @@ #ifndef PSSTROKERENDERER_H # define PSSTROKERENDERER_H -# include "../system/FreestyleConfig.h" # include "StrokeRenderer.h" +# include "../system/FreestyleConfig.h" # include /**********************************/ diff --git a/source/blender/freestyle/intern/stroke/Stroke.h b/source/blender/freestyle/intern/stroke/Stroke.h index 796b5dc9e2d..5e0974edea7 100755 --- a/source/blender/freestyle/intern/stroke/Stroke.h +++ b/source/blender/freestyle/intern/stroke/Stroke.h @@ -30,10 +30,10 @@ #ifndef STROKE_H # define STROKE_H +# include "../view_map/Silhouette.h" # include # include # include "../system/FreestyleConfig.h" -# include "../view_map/Silhouette.h" # include "Curve.h" # include "../view_map/Interface1D.h" # include "../system/StringUtils.h" diff --git a/source/blender/freestyle/intern/stroke/StrokeIO.h b/source/blender/freestyle/intern/stroke/StrokeIO.h index c99704c3b37..150c8340778 100755 --- a/source/blender/freestyle/intern/stroke/StrokeIO.h +++ b/source/blender/freestyle/intern/stroke/StrokeIO.h @@ -30,9 +30,9 @@ #ifndef STROKEIO_H # define STROKEIO_H +# include "Stroke.h" # include # include "../system/FreestyleConfig.h" -# include "Stroke.h" LIB_STROKE_EXPORT ostream& operator<<(ostream& out, const StrokeAttribute& iStrokeAttribute); diff --git a/source/blender/freestyle/intern/stroke/StrokeLayer.cpp b/source/blender/freestyle/intern/stroke/StrokeLayer.cpp index 8b469399ca8..d5fc27d3d73 100755 --- a/source/blender/freestyle/intern/stroke/StrokeLayer.cpp +++ b/source/blender/freestyle/intern/stroke/StrokeLayer.cpp @@ -19,8 +19,8 @@ // /////////////////////////////////////////////////////////////////////////////// -#include "StrokeLayer.h" #include "Stroke.h" +#include "StrokeLayer.h" #include "Canvas.h" StrokeLayer::~StrokeLayer() diff --git a/source/blender/freestyle/intern/stroke/StrokeRenderer.h b/source/blender/freestyle/intern/stroke/StrokeRenderer.h index 339e401aa41..c7c6df635d5 100755 --- a/source/blender/freestyle/intern/stroke/StrokeRenderer.h +++ b/source/blender/freestyle/intern/stroke/StrokeRenderer.h @@ -30,11 +30,11 @@ #ifndef STROKE_RENDERER_H # define STROKE_RENDERER_H +# include "Stroke.h" # include # include # include # include "../system/FreestyleConfig.h" -# include "Stroke.h" # include "StrokeRep.h" # include diff --git a/source/blender/freestyle/intern/stroke/StrokeRep.cpp b/source/blender/freestyle/intern/stroke/StrokeRep.cpp index 51a1c8cfd4d..fbe1273bac0 100755 --- a/source/blender/freestyle/intern/stroke/StrokeRep.cpp +++ b/source/blender/freestyle/intern/stroke/StrokeRep.cpp @@ -19,8 +19,8 @@ // /////////////////////////////////////////////////////////////////////////////// -#include "StrokeRep.h" #include "Stroke.h" +#include "StrokeRep.h" #include "StrokeRenderer.h" #include "StrokeAdvancedIterators.h" #include "StrokeIterators.h" diff --git a/source/blender/freestyle/intern/stroke/StrokeTesselator.cpp b/source/blender/freestyle/intern/stroke/StrokeTesselator.cpp index 465e5662774..a8b71f9f3c3 100755 --- a/source/blender/freestyle/intern/stroke/StrokeTesselator.cpp +++ b/source/blender/freestyle/intern/stroke/StrokeTesselator.cpp @@ -19,10 +19,10 @@ // /////////////////////////////////////////////////////////////////////////////// +#include "StrokeTesselator.h" #include "../scene_graph/OrientedLineRep.h" #include "../scene_graph/NodeGroup.h" #include "../scene_graph/NodeShape.h" -#include "StrokeTesselator.h" #include "StrokeAdvancedIterators.h" LineRep* StrokeTesselator::Tesselate(Stroke *iStroke) diff --git a/source/blender/freestyle/intern/stroke/StrokeTesselator.h b/source/blender/freestyle/intern/stroke/StrokeTesselator.h index 1de281734cd..671df00ef84 100755 --- a/source/blender/freestyle/intern/stroke/StrokeTesselator.h +++ b/source/blender/freestyle/intern/stroke/StrokeTesselator.h @@ -31,8 +31,8 @@ #ifndef STROKETESSELATOR_H # define STROKETESSELATOR_H -# include "../scene_graph/LineRep.h" # include "Stroke.h" +# include "../scene_graph/LineRep.h" class StrokeTesselator { diff --git a/source/blender/freestyle/intern/stroke/TextStrokeRenderer.h b/source/blender/freestyle/intern/stroke/TextStrokeRenderer.h index ef610d63bdd..8b4b6bc80d7 100755 --- a/source/blender/freestyle/intern/stroke/TextStrokeRenderer.h +++ b/source/blender/freestyle/intern/stroke/TextStrokeRenderer.h @@ -35,8 +35,8 @@ #ifndef TEXTSTROKERENDERER_H # define TEXTSTROKERENDERER_H -# include "../system/FreestyleConfig.h" # include "StrokeRenderer.h" +# include "../system/FreestyleConfig.h" # include /**********************************/ diff --git a/source/blender/freestyle/intern/system/PythonInterpreter.h b/source/blender/freestyle/intern/system/PythonInterpreter.h index bf1a5064d3e..1178e18cdea 100755 --- a/source/blender/freestyle/intern/system/PythonInterpreter.h +++ b/source/blender/freestyle/intern/system/PythonInterpreter.h @@ -30,8 +30,8 @@ #ifndef PYTHON_INTERPRETER_H # define PYTHON_INTERPRETER_H -# include # include +# include # include "StringUtils.h" # include "Interpreter.h" diff --git a/source/blender/freestyle/intern/view_map/Functions1D.h b/source/blender/freestyle/intern/view_map/Functions1D.h index c4060e0897f..ba42b25b47e 100755 --- a/source/blender/freestyle/intern/view_map/Functions1D.h +++ b/source/blender/freestyle/intern/view_map/Functions1D.h @@ -30,11 +30,11 @@ #ifndef FUNCTIONS1D_HPP # define FUNCTIONS1D_HPP -# include "../system/Precision.h" -# include "../system/TimeStamp.h" # include "ViewMap.h" # include "Functions0D.h" # include "Interface1D.h" +# include "../system/Precision.h" +# include "../system/TimeStamp.h" # include "../system/FreestyleConfig.h" #include "../python/Director.h" diff --git a/source/blender/freestyle/intern/view_map/Interface0D.h b/source/blender/freestyle/intern/view_map/Interface0D.h index 5108524cdd3..48d956eec19 100755 --- a/source/blender/freestyle/intern/view_map/Interface0D.h +++ b/source/blender/freestyle/intern/view_map/Interface0D.h @@ -30,6 +30,7 @@ #ifndef INTERFACE0D_H # define INTERFACE0D_H +# include # include # include # include "../system/Id.h" @@ -40,16 +41,6 @@ using namespace std; #include "../system/Iterator.h" //soc -#ifdef __cplusplus -extern "C" { -#endif - -#include - -#ifdef __cplusplus -} -#endif - // // Interface0D // diff --git a/source/blender/freestyle/intern/view_map/Interface1D.h b/source/blender/freestyle/intern/view_map/Interface1D.h index 17dee3973de..60cc0ebcb7e 100755 --- a/source/blender/freestyle/intern/view_map/Interface1D.h +++ b/source/blender/freestyle/intern/view_map/Interface1D.h @@ -30,6 +30,7 @@ #ifndef INTERFACE1D_H # define INTERFACE1D_H +# include # include # include # include @@ -38,16 +39,6 @@ # include "../winged_edge/Nature.h" # include "Functions0D.h" -#ifdef __cplusplus -extern "C" { -#endif - -#include - -#ifdef __cplusplus -} -#endif - using namespace std; /*! \file Interface1D.h * Interface1D and related tools definitions diff --git a/source/blender/freestyle/intern/view_map/Silhouette.h b/source/blender/freestyle/intern/view_map/Silhouette.h index a928eb87cc9..fc0bff9cbff 100755 --- a/source/blender/freestyle/intern/view_map/Silhouette.h +++ b/source/blender/freestyle/intern/view_map/Silhouette.h @@ -30,6 +30,8 @@ #ifndef SILHOUETTE_H # define SILHOUETTE_H +# include "Interface0D.h" +# include "Interface1D.h" # include # include # include @@ -41,8 +43,6 @@ # include "../scene_graph/FrsMaterial.h" # include "../geometry/Polygon.h" # include "../system/Exception.h" -# include "Interface0D.h" -# include "Interface1D.h" # include "../winged_edge/Curvature.h" using namespace std; diff --git a/source/blender/freestyle/intern/view_map/SilhouetteGeomEngine.cpp b/source/blender/freestyle/intern/view_map/SilhouetteGeomEngine.cpp index f91318101a0..c0817189bc2 100755 --- a/source/blender/freestyle/intern/view_map/SilhouetteGeomEngine.cpp +++ b/source/blender/freestyle/intern/view_map/SilhouetteGeomEngine.cpp @@ -19,8 +19,8 @@ // /////////////////////////////////////////////////////////////////////////////// -#include "SilhouetteGeomEngine.h" #include "Silhouette.h" +#include "SilhouetteGeomEngine.h" #include "../geometry/GeomUtils.h" using namespace std; diff --git a/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp b/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp index 13c6bd65312..2c3a2cebadc 100755 --- a/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp +++ b/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp @@ -18,10 +18,10 @@ // /////////////////////////////////////////////////////////////////////////////// +#include "Silhouette.h" #include "SteerableViewMap.h" #include "../image/ImagePyramid.h" #include "../image/Image.h" -#include "Silhouette.h" #include #include "../geometry/Geom.h" using namespace Geometry; diff --git a/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.cpp b/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.cpp index 5f7b313aaf6..3e0979f684f 100755 --- a/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.cpp +++ b/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.cpp @@ -18,9 +18,9 @@ // /////////////////////////////////////////////////////////////////////////////// +#include "ViewMap.h" #include "ViewEdgeXBuilder.h" #include "../winged_edge/WXEdge.h" -#include "ViewMap.h" #include "SilhouetteGeomEngine.h" #include diff --git a/source/blender/freestyle/intern/view_map/ViewMap.h b/source/blender/freestyle/intern/view_map/ViewMap.h index 3f6be25312a..5a9d8f3b57b 100755 --- a/source/blender/freestyle/intern/view_map/ViewMap.h +++ b/source/blender/freestyle/intern/view_map/ViewMap.h @@ -30,12 +30,12 @@ #ifndef VIEWMAP_H # define VIEWMAP_H -# include "../system/BaseIterator.h" -# include "../system/FreestyleConfig.h" -# include "../geometry/GeomUtils.h" # include "Interface0D.h" # include "Interface1D.h" # include "Silhouette.h" // defines the embedding +# include "../system/BaseIterator.h" +# include "../system/FreestyleConfig.h" +# include "../geometry/GeomUtils.h" # include /**********************************/ diff --git a/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp b/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp index 96635517747..7e582e7f037 100755 --- a/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp +++ b/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp @@ -19,8 +19,8 @@ // /////////////////////////////////////////////////////////////////////////////// -#include #include "ViewMapBuilder.h" +#include using namespace std; diff --git a/source/blender/freestyle/intern/view_map/ViewMapBuilder.h b/source/blender/freestyle/intern/view_map/ViewMapBuilder.h index aad9aa245b7..12b1266fa12 100755 --- a/source/blender/freestyle/intern/view_map/ViewMapBuilder.h +++ b/source/blender/freestyle/intern/view_map/ViewMapBuilder.h @@ -31,12 +31,12 @@ #ifndef VIEWMAPBUILDER_H # define VIEWMAPBUILDER_H +# include "Silhouette.h" # include # include "../system/FreestyleConfig.h" # include "../geometry/Geom.h" # include "../scene_graph/NodeGroup.h" # include "../winged_edge/WXEdge.h" -# include "Silhouette.h" # include "../geometry/GeomUtils.h" # include "../geometry/Grid.h" # include "../system/ProgressBar.h" diff --git a/source/blender/freestyle/intern/view_map/ViewMapIO.h b/source/blender/freestyle/intern/view_map/ViewMapIO.h index 33e168b537b..185841a90ec 100755 --- a/source/blender/freestyle/intern/view_map/ViewMapIO.h +++ b/source/blender/freestyle/intern/view_map/ViewMapIO.h @@ -30,11 +30,11 @@ #ifndef VIEWMAPIO_H # define VIEWMAPIO_H +# include "ViewMap.h" # include # include # include "../system/FreestyleConfig.h" # include "../system/ProgressBar.h" -# include "ViewMap.h" namespace ViewMapIO { diff --git a/source/blender/freestyle/intern/view_map/ViewMapTesselator.h b/source/blender/freestyle/intern/view_map/ViewMapTesselator.h index 630bfa561f2..0177dc630b8 100755 --- a/source/blender/freestyle/intern/view_map/ViewMapTesselator.h +++ b/source/blender/freestyle/intern/view_map/ViewMapTesselator.h @@ -31,10 +31,10 @@ #ifndef VIEWMAPTESSELATOR_H # define VIEWMAPTESSELATOR_H -# include "../scene_graph/NodeShape.h" -# include "../winged_edge/WEdge.h" # include "Silhouette.h" # include "ViewMap.h" +# include "../scene_graph/NodeShape.h" +# include "../winged_edge/WEdge.h" # include "../scene_graph/NodeGroup.h" # include "../scene_graph/LineRep.h" # include "../scene_graph/OrientedLineRep.h" -- cgit v1.2.3