From 0d5075676e7dd39efd5f46428920ca45d320977f Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Tue, 20 Apr 2010 09:28:15 +0000 Subject: [PATCH] Fix #22085: compile error on windows, M_PI undeclared. --- intern/iksolver/intern/IK_QSegment.cpp | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/intern/iksolver/intern/IK_QSegment.cpp b/intern/iksolver/intern/IK_QSegment.cpp index 50364f3627f..5de5846cb61 100644 --- a/intern/iksolver/intern/IK_QSegment.cpp +++ b/intern/iksolver/intern/IK_QSegment.cpp @@ -28,9 +28,6 @@ */ #include "IK_QSegment.h" -#ifdef WIN32 -#define _USE_MATH_DEFINES -#endif #include // Utility functions @@ -372,8 +369,8 @@ void IK_QSphericalSegment::SetLimit(int axis, MT_Scalar lmin, MT_Scalar lmax) return; if (axis == 1) { - lmin = MT_clamp(lmin, -M_PI, M_PI); - lmax = MT_clamp(lmax, -M_PI, M_PI); + lmin = MT_clamp(lmin, -MT_PI, MT_PI); + lmax = MT_clamp(lmax, -MT_PI, MT_PI); m_min_y = lmin; m_max_y = lmax; @@ -382,8 +379,8 @@ void IK_QSphericalSegment::SetLimit(int axis, MT_Scalar lmin, MT_Scalar lmax) } else { // clamp and convert to axis angle parameters - lmin = MT_clamp(lmin, -M_PI, M_PI); - lmax = MT_clamp(lmax, -M_PI, M_PI); + lmin = MT_clamp(lmin, -MT_PI, MT_PI); + lmax = MT_clamp(lmax, -MT_PI, MT_PI); lmin = sin(lmin*0.5); lmax = sin(lmax*0.5); @@ -615,8 +612,8 @@ void IK_QRevoluteSegment::SetLimit(int axis, MT_Scalar lmin, MT_Scalar lmax) return; // clamp and convert to axis angle parameters - lmin = MT_clamp(lmin, -M_PI, M_PI); - lmax = MT_clamp(lmax, -M_PI, M_PI); + lmin = MT_clamp(lmin, -MT_PI, MT_PI); + lmax = MT_clamp(lmax, -MT_PI, MT_PI); m_min = lmin; m_max = lmax; @@ -754,8 +751,8 @@ void IK_QSwingSegment::SetLimit(int axis, MT_Scalar lmin, MT_Scalar lmax) return; // clamp and convert to axis angle parameters - lmin = MT_clamp(lmin, -M_PI, M_PI); - lmax = MT_clamp(lmax, -M_PI, M_PI); + lmin = MT_clamp(lmin, -MT_PI, MT_PI); + lmax = MT_clamp(lmax, -MT_PI, MT_PI); lmin = sin(lmin*0.5); lmax = sin(lmax*0.5); @@ -900,8 +897,8 @@ void IK_QElbowSegment::SetLimit(int axis, MT_Scalar lmin, MT_Scalar lmax) return; // clamp and convert to axis angle parameters - lmin = MT_clamp(lmin, -M_PI, M_PI); - lmax = MT_clamp(lmax, -M_PI, M_PI); + lmin = MT_clamp(lmin, -MT_PI, MT_PI); + lmax = MT_clamp(lmax, -MT_PI, MT_PI); lmin = lmin; lmax = lmax;