diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-09-23 15:30:55 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-09-23 15:30:55 +0400 |
| commit | 5bd83eede042302dc734810a3a314eb3320b2ed5 (patch) | |
| tree | 09ceb7ea8c294cfca1c41184044476ab178172b9 /source/gameengine | |
| parent | 161c3861bc09d3e666d4c73d35da85e024fe779f (diff) | |
| parent | ae0124157f012aeda994534c21aebda1bae054cd (diff) | |
svn merge ^/trunk/blender -r40405:40431
Diffstat (limited to 'source/gameengine')
| -rw-r--r-- | source/gameengine/Converter/BL_ShapeActionActuator.cpp | 4 | ||||
| -rw-r--r-- | source/gameengine/Ketsji/KX_IpoActuator.cpp | 5 |
2 files changed, 0 insertions, 9 deletions
diff --git a/source/gameengine/Converter/BL_ShapeActionActuator.cpp b/source/gameengine/Converter/BL_ShapeActionActuator.cpp index ac377cdb7ca..c81ff107a98 100644 --- a/source/gameengine/Converter/BL_ShapeActionActuator.cpp +++ b/source/gameengine/Converter/BL_ShapeActionActuator.cpp @@ -32,11 +32,7 @@ */ -#if defined (__sgi) -#include <math.h> -#else #include <cmath> -#endif #include "SCA_LogicManager.h" #include "BL_ShapeActionActuator.h" diff --git a/source/gameengine/Ketsji/KX_IpoActuator.cpp b/source/gameengine/Ketsji/KX_IpoActuator.cpp index aed6c666404..cc5a8ecc727 100644 --- a/source/gameengine/Ketsji/KX_IpoActuator.cpp +++ b/source/gameengine/Ketsji/KX_IpoActuator.cpp @@ -33,12 +33,7 @@ * \ingroup ketsji */ - -#if defined (__sgi) -#include <math.h> -#else #include <cmath> -#endif #include "KX_IpoActuator.h" #include "KX_GameObject.h" |