[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28298] trunk/blender/intern/iksolver/ intern/IK_QSegment.cpp: Fix #22085: compile error on windows, M_PI undeclared.

[Brecht Van Lommel]

Revision: 28298
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28298
Author:   blendix
Date:     2010-04-20 11:28:15 +0200 (Tue, 20 Apr 2010)

Log Message:
-----------
Fix #22085: compile error on windows, M_PI undeclared.

Modified Paths:
--------------
    trunk/blender/intern/iksolver/intern/IK_QSegment.cpp

Modified: trunk/blender/intern/iksolver/intern/IK_QSegment.cpp
===================================================================
--- trunk/blender/intern/iksolver/intern/IK_QSegment.cpp	2010-04-20 08:35:58 UTC (rev 28297)
+++ trunk/blender/intern/iksolver/intern/IK_QSegment.cpp	2010-04-20 09:28:15 UTC (rev 28298)
@@ -28,9 +28,6 @@
  */
 
 #include "IK_QSegment.h"
-#ifdef WIN32
-#define _USE_MATH_DEFINES
-#endif
 #include <cmath>
 
 // Utility functions
@@ -372,8 +369,8 @@
 		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 @@
 	}
 	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 @@
 		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 @@
 		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 @@
 		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;