From 3458bad12d4ba7c1184a44fcdabfef265335d30c Mon Sep 17 00:00:00 2001 From: Tamito Kajiyama Date: Thu, 17 Apr 2014 12:45:22 +0900 Subject: Freestyle: removed unnecessary #include files and made minor code cleanup. --- source/blender/freestyle/intern/geometry/GridHelpers.cpp | 2 -- .../freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.h | 1 - .../intern/python/UnaryFunction0D/BPy_UnaryFunction0DDouble.cpp | 2 -- source/blender/freestyle/intern/stroke/ChainingIterators.h | 3 +-- source/blender/freestyle/intern/view_map/CulledOccluderSource.cpp | 2 -- source/blender/freestyle/intern/view_map/Functions1D.cpp | 2 +- source/blender/freestyle/intern/view_map/Interface0D.h | 6 ++++-- source/blender/freestyle/intern/view_map/Interface1D.h | 3 ++- source/blender/freestyle/intern/view_map/SteerableViewMap.cpp | 2 -- 9 files changed, 8 insertions(+), 15 deletions(-) (limited to 'source') diff --git a/source/blender/freestyle/intern/geometry/GridHelpers.cpp b/source/blender/freestyle/intern/geometry/GridHelpers.cpp index 2b809608edf..a0543e56a36 100644 --- a/source/blender/freestyle/intern/geometry/GridHelpers.cpp +++ b/source/blender/freestyle/intern/geometry/GridHelpers.cpp @@ -25,8 +25,6 @@ * \date 2010-12-21 */ -#include - #include "GridHelpers.h" namespace Freestyle { diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.h b/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.h index 3dea73cdd08..bb1207aa46b 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.h +++ b/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.h @@ -25,7 +25,6 @@ #ifndef __FREESTYLE_PYTHON_ORIENTEDVIEWEDGEITERATOR_H__ #define __FREESTYLE_PYTHON_ORIENTEDVIEWEDGEITERATOR_H__ -#include "../../stroke/Stroke.h" #include "../BPy_Iterator.h" #include "../../view_map/ViewMapIterators.h" diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DDouble.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DDouble.cpp index be2be0a9c5c..06ba12145c0 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DDouble.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DDouble.cpp @@ -38,8 +38,6 @@ #include "UnaryFunction0D_double/BPy_LocalAverageDepthF0D.h" #include "UnaryFunction0D_double/BPy_ZDiscontinuityF0D.h" -#include "../Director.h" - #ifdef __cplusplus extern "C" { #endif diff --git a/source/blender/freestyle/intern/stroke/ChainingIterators.h b/source/blender/freestyle/intern/stroke/ChainingIterators.h index 5a8d4b678b8..ff9203d3af6 100644 --- a/source/blender/freestyle/intern/stroke/ChainingIterators.h +++ b/source/blender/freestyle/intern/stroke/ChainingIterators.h @@ -32,8 +32,7 @@ #include "Predicates1D.h" - -#include "../system/Iterator.h" //soc +#include "../system/Iterator.h" #include "../view_map/ViewMap.h" #include "../view_map/ViewMapIterators.h" diff --git a/source/blender/freestyle/intern/view_map/CulledOccluderSource.cpp b/source/blender/freestyle/intern/view_map/CulledOccluderSource.cpp index 2a1388c939b..d98a3238a25 100644 --- a/source/blender/freestyle/intern/view_map/CulledOccluderSource.cpp +++ b/source/blender/freestyle/intern/view_map/CulledOccluderSource.cpp @@ -27,8 +27,6 @@ #include "CulledOccluderSource.h" -#include "FRS_freestyle.h" - #include "../geometry/GridHelpers.h" #include "BKE_global.h" diff --git a/source/blender/freestyle/intern/view_map/Functions1D.cpp b/source/blender/freestyle/intern/view_map/Functions1D.cpp index c66d8b8bfe7..f29da6680bf 100644 --- a/source/blender/freestyle/intern/view_map/Functions1D.cpp +++ b/source/blender/freestyle/intern/view_map/Functions1D.cpp @@ -26,7 +26,7 @@ * \date 01/07/2003 */ -# include "Functions1D.h" +#include "Functions1D.h" using namespace std; diff --git a/source/blender/freestyle/intern/view_map/Interface0D.h b/source/blender/freestyle/intern/view_map/Interface0D.h index 8f7137f412a..e59ed4c96c8 100644 --- a/source/blender/freestyle/intern/view_map/Interface0D.h +++ b/source/blender/freestyle/intern/view_map/Interface0D.h @@ -34,7 +34,7 @@ #include "../geometry/Geom.h" #include "../system/Id.h" -#include "../system/Iterator.h" //soc +#include "../system/Iterator.h" #include "../system/Precision.h" #include "../winged_edge/Nature.h" @@ -64,7 +64,9 @@ class Interface0D public: /*! Default constructor */ Interface0D() {} - virtual ~Interface0D() {}; //soc + + /*! Destructor */ + virtual ~Interface0D() {}; /*! Returns the string "Interface0D". */ virtual string getExactTypeName() const diff --git a/source/blender/freestyle/intern/view_map/Interface1D.h b/source/blender/freestyle/intern/view_map/Interface1D.h index 95ace73af14..7afa61ff496 100644 --- a/source/blender/freestyle/intern/view_map/Interface1D.h +++ b/source/blender/freestyle/intern/view_map/Interface1D.h @@ -136,7 +136,8 @@ public: _timeStamp = 0; } - virtual ~Interface1D() {}; //soc + /*! Destructor */ + virtual ~Interface1D() {}; /*! Returns the string "Interface1D". */ virtual string getExactTypeName() const diff --git a/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp b/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp index a4cb2a4a4f9..fe6f3f1892d 100644 --- a/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp +++ b/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp @@ -25,8 +25,6 @@ * \date 01/07/2003 */ -//soc #include -//soc #include #include #include "Silhouette.h" -- cgit v1.2.3