Changeset 8284 for code/branches/kicklib2/src/external/bullet/BulletCollision/NarrowPhaseCollision/btGjkEpa2.h

Timestamp:

Apr 21, 2011, 6:58:23 PM (14 years ago)

Author:

rgrieder

Message:

Merged revisions 7978 - 8096 from kicklib to kicklib2.

Location:

code/branches/kicklib2

Files:

• . (modified) (1 prop)
• src/external/bullet/BulletCollision/NarrowPhaseCollision/btGjkEpa2.h (modified) (2 diffs)

code/branches/kicklib2/src/external/bullet/BulletCollision/NarrowPhaseCollision/btGjkEpa2.h

@@ -56 +56 @@
                                                         sResults& results,
                                                         bool usemargins=true);
-
+#ifndef __SPU__
 static btScalar SignedDistance( const btVector3& position,
                                                                 btScalar margin,
@@ -67 +67 @@
                                                                 const btVector3& guess,
                                                                 sResults& results);
+#endif //__SPU__
+
 };