diff options
| -rw-r--r-- | extern/bullet2/src/LinearMath/btScalar.h | 4 | ||||
| -rw-r--r-- | intern/elbeem/intern/mvmcoords.cpp | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/extern/bullet2/src/LinearMath/btScalar.h b/extern/bullet2/src/LinearMath/btScalar.h index fa0262940ef..c24e4644005 100644 --- a/extern/bullet2/src/LinearMath/btScalar.h +++ b/extern/bullet2/src/LinearMath/btScalar.h @@ -35,6 +35,10 @@ inline int btGetVersion() #define BT_DEBUG #endif +/* XXX Need to fix these... needed for SunOS 5.8 */ +#define sinf(a) sin((double)(a)) +#define cosf(a) cos((double)(a)) +#define fabsf(a) fabs((double)(a)) #ifdef WIN32 diff --git a/intern/elbeem/intern/mvmcoords.cpp b/intern/elbeem/intern/mvmcoords.cpp index ac954b956d0..03f6482ae84 100644 --- a/intern/elbeem/intern/mvmcoords.cpp +++ b/intern/elbeem/intern/mvmcoords.cpp @@ -98,9 +98,9 @@ void MeanValueMeshCoords::computeWeights(vector<ntlVec3Gfx> &reference_vertices, if(mvmFullDebug) errMsg("MeanValueMeshCoords::computeWeights","c="<<c<<" phi="<<phi<<" d="<<d); //if (c[0] > 1. || c[0] < 0. || c[1] > 1. || c[1] < 0. || c[2] > 1. || c[2] < 0.) continue; - s[0] = sqrtf((float)(1.-c[0]*c[0])); - s[1] = sqrtf((float)(1.-c[1]*c[1])); - s[2] = sqrtf((float)(1.-c[2]*c[2])); + s[0] = sqrt((float)(1.-c[0]*c[0])); + s[1] = sqrt((float)(1.-c[1]*c[1])); + s[2] = sqrt((float)(1.-c[2]*c[2])); if(mvmFullDebug) errMsg("MeanValueMeshCoords::computeWeights","s"); if (s[0] <= cEPS || s[1] <= cEPS || s[2] <= cEPS) { |