[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16905] trunk/blender/extern/bullet2/src: Move the Solaris workaround in btScalar behind the sun define, to only make sun and apple ppc slower:

[Erwin Coumans]

Revision: 16905
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16905
Author:   erwin
Date:     2008-10-03 22:51:56 +0200 (Fri, 03 Oct 2008)

Log Message:
-----------
Move the Solaris workaround in btScalar behind the sun define, to only make sun and apple ppc slower:
#if defined (__sun) || defined (__sun__) || defined (__sparc) || (defined (__APPLE__) && ! defined (__i386__))
Also includes a fix to uninitialized variable (can cause failing collisions).

If possible, report all changes to extern/bullet2 to http://code.google.com/p/bullet/issues/list

Modified Paths:
--------------
    trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.cpp
    trunk/blender/extern/bullet2/src/LinearMath/btScalar.h

Modified: trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.cpp
===================================================================
--- trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.cpp	2008-10-03 20:39:15 UTC (rev 16904)
+++ trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.cpp	2008-10-03 20:51:56 UTC (rev 16905)
@@ -16,6 +16,7 @@
 #include "btTriangleIndexVertexArray.h"
 
 btTriangleIndexVertexArray::btTriangleIndexVertexArray(int numTriangles,int* triangleIndexBase,int triangleIndexStride,int numVertices,btScalar* vertexBase,int vertexStride)
+: m_hasAabb(0)
 {
 	btIndexedMesh mesh;
 

Modified: trunk/blender/extern/bullet2/src/LinearMath/btScalar.h
===================================================================
--- trunk/blender/extern/bullet2/src/LinearMath/btScalar.h	2008-10-03 20:39:15 UTC (rev 16904)
+++ trunk/blender/extern/bullet2/src/LinearMath/btScalar.h	2008-10-03 20:51:56 UTC (rev 16905)
@@ -35,10 +35,6 @@
 #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
 
@@ -145,6 +141,10 @@
 /// older compilers (gcc 3.x) and Sun needs double version of sqrt etc.
 /// exclude Apple Intel (i's assumed to be a Macbook or new Intel Dual Core Processor)
 #if defined (__sun) || defined (__sun__) || defined (__sparc) || (defined (__APPLE__) && ! defined (__i386__))
+/* 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))
 //use slow double float precision operation on those platforms
 #ifndef BT_USE_DOUBLE_PRECISION
 #define BT_FORCE_DOUBLE_FUNCTIONS