Changeset 8393 for code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btConeShape.h

Timestamp:

May 3, 2011, 5:07:42 AM (13 years ago)

Author:

rgrieder

Message:

Updated Bullet from v2.77 to v2.78.
(I'm not going to make a branch for that since the update from 2.74 to 2.77 hasn't been tested that much either).

You will HAVE to do a complete RECOMPILE! I tested with MSVC and MinGW and they both threw linker errors at me.

File:

• code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btConeShape.h (modified) (3 diffs)

code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btConeShape.h

@@ -14 +14 @@
 */
 
-#ifndef CONE_MINKOWSKI_H
-#define CONE_MINKOWSKI_H
+#ifndef BT_CONE_MINKOWSKI_H
+#define BT_CONE_MINKOWSKI_H
 
 #include "btConvexInternalShape.h"
@@ -82 +82 @@
                         return m_coneIndices[1];
                 }
+
+        virtual void    setLocalScaling(const btVector3& scaling);
+
 };
 
@@ -97 +100 @@
                 btConeShapeZ(btScalar radius,btScalar height);
 };
-#endif //CONE_MINKOWSKI_H
+#endif //BT_CONE_MINKOWSKI_H