[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16899] trunk/blender: Solaris was having problems with sqrtf and friends again.

Kent Mein mein at cs.umn.edu
Fri Oct 3 15:16:17 CEST 2008


Revision: 16899
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16899
Author:   sirdude
Date:     2008-10-03 15:16:10 +0200 (Fri, 03 Oct 2008)

Log Message:
-----------
Solaris was having problems with sqrtf and friends again.
I changed sqrtf to sqrt in elbeem
in bullet2 I added defines found in floatpatch.h eventually
we should make a "floatpatch.h" that all of blender can use.

Kent

Modified Paths:
--------------
    trunk/blender/extern/bullet2/src/LinearMath/btScalar.h
    trunk/blender/intern/elbeem/intern/mvmcoords.cpp

Modified: trunk/blender/extern/bullet2/src/LinearMath/btScalar.h
===================================================================
--- trunk/blender/extern/bullet2/src/LinearMath/btScalar.h	2008-10-03 13:02:34 UTC (rev 16898)
+++ trunk/blender/extern/bullet2/src/LinearMath/btScalar.h	2008-10-03 13:16:10 UTC (rev 16899)
@@ -35,6 +35,10 @@
 #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
 

Modified: trunk/blender/intern/elbeem/intern/mvmcoords.cpp
===================================================================
--- trunk/blender/intern/elbeem/intern/mvmcoords.cpp	2008-10-03 13:02:34 UTC (rev 16898)
+++ trunk/blender/intern/elbeem/intern/mvmcoords.cpp	2008-10-03 13:16:10 UTC (rev 16899)
@@ -98,9 +98,9 @@
 		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) {





More information about the Bf-blender-cvs mailing list