diff options
Diffstat (limited to 'source/blender')
9 files changed, 11 insertions, 10 deletions
diff --git a/source/blender/freestyle/intern/application/AppView.h b/source/blender/freestyle/intern/application/AppView.h index 3f6d0b8e93e..14101909ca1 100644 --- a/source/blender/freestyle/intern/application/AppView.h +++ b/source/blender/freestyle/intern/application/AppView.h @@ -31,6 +31,8 @@ #include "../scene_graph/NodeDrawingStyle.h" #include "../system/Precision.h" +#include "BLI_math.h" + #ifdef WITH_CXX_GUARDEDALLOC #include "MEM_guardedalloc.h" #endif diff --git a/source/blender/freestyle/intern/geometry/matrix_util.cpp b/source/blender/freestyle/intern/geometry/matrix_util.cpp index 7905dda5843..5e585497516 100644 --- a/source/blender/freestyle/intern/geometry/matrix_util.cpp +++ b/source/blender/freestyle/intern/geometry/matrix_util.cpp @@ -36,10 +36,10 @@ * \author Bruno Levy */ -#include <math.h> - #include "matrix_util.h" +#include "BLI_math.h" + namespace Freestyle { namespace OGF { diff --git a/source/blender/freestyle/intern/scene_graph/NodeTransform.cpp b/source/blender/freestyle/intern/scene_graph/NodeTransform.cpp index 5d26e85195f..8a25fe142d1 100644 --- a/source/blender/freestyle/intern/scene_graph/NodeTransform.cpp +++ b/source/blender/freestyle/intern/scene_graph/NodeTransform.cpp @@ -28,7 +28,7 @@ #include "NodeTransform.h" -#include "../system/FreestyleConfig.h" +#include "BLI_math.h" namespace Freestyle { diff --git a/source/blender/freestyle/intern/system/FreestyleConfig.h b/source/blender/freestyle/intern/system/FreestyleConfig.h index 42f9833836d..5c53479029f 100644 --- a/source/blender/freestyle/intern/system/FreestyleConfig.h +++ b/source/blender/freestyle/intern/system/FreestyleConfig.h @@ -30,8 +30,6 @@ #include <string> -#include "BLI_math.h" - using namespace std; namespace Freestyle { diff --git a/source/blender/freestyle/intern/view_map/FEdgeXDetector.cpp b/source/blender/freestyle/intern/view_map/FEdgeXDetector.cpp index 2da82f175ed..9c9cd88f188 100644 --- a/source/blender/freestyle/intern/view_map/FEdgeXDetector.cpp +++ b/source/blender/freestyle/intern/view_map/FEdgeXDetector.cpp @@ -26,7 +26,6 @@ */ #include <float.h> -#include <math.h> #include "FEdgeXDetector.h" diff --git a/source/blender/freestyle/intern/view_map/FEdgeXDetector.h b/source/blender/freestyle/intern/view_map/FEdgeXDetector.h index 2bc0cd13e88..a26f8d289e7 100644 --- a/source/blender/freestyle/intern/view_map/FEdgeXDetector.h +++ b/source/blender/freestyle/intern/view_map/FEdgeXDetector.h @@ -39,6 +39,8 @@ #include "../winged_edge/Curvature.h" #include "../winged_edge/WXEdge.h" +#include "BLI_math.h" + #ifdef WITH_CXX_GUARDEDALLOC #include "MEM_guardedalloc.h" #endif diff --git a/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp b/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp index c777db6249f..a4cb2a4a4f9 100644 --- a/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp +++ b/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp @@ -25,7 +25,6 @@ * \date 01/07/2003 */ -#include <math.h> //soc #include <qimage.h> //soc #include <qstring.h> #include <sstream> @@ -39,6 +38,7 @@ #include "../image/Image.h" #include "BKE_global.h" +#include "BLI_math.h" extern "C" { #include "IMB_imbuf.h" diff --git a/source/blender/freestyle/intern/winged_edge/Curvature.cpp b/source/blender/freestyle/intern/winged_edge/Curvature.cpp index 4493080c8fb..4a910099bff 100644 --- a/source/blender/freestyle/intern/winged_edge/Curvature.cpp +++ b/source/blender/freestyle/intern/winged_edge/Curvature.cpp @@ -45,7 +45,6 @@ #include <assert.h> #include <cstdlib> // for malloc and free -#include <math.h> #include <set> #include <stack> @@ -54,7 +53,7 @@ #include "../geometry/normal_cycle.h" -#include "../system/FreestyleConfig.h" +#include "BLI_math.h" namespace Freestyle { diff --git a/source/blender/freestyle/intern/winged_edge/WEdge.h b/source/blender/freestyle/intern/winged_edge/WEdge.h index f0692aecd5b..50d1de5e595 100644 --- a/source/blender/freestyle/intern/winged_edge/WEdge.h +++ b/source/blender/freestyle/intern/winged_edge/WEdge.h @@ -29,7 +29,6 @@ */ #include <iterator> -#include <math.h> #include <vector> #include "../geometry/Geom.h" @@ -38,6 +37,8 @@ #include "../system/FreestyleConfig.h" +#include "BLI_math.h" + #ifdef WITH_CXX_GUARDEDALLOC #include "MEM_guardedalloc.h" #endif |