From e269034494510770e1d06db01eb5b0863b16d707 Mon Sep 17 00:00:00 2001 From: "erwin.coumans" Date: Fri, 16 Jul 2010 23:41:29 +0000 Subject: [PATCH] removed obsolete virtual implementation of 'getUpAxis' in btCylinderShapeZ. It has been replaced by the non-virtual implementation in the base class (for Cell SPU) Thanks to Paul Dubois for the report, see Issue 407 --- src/BulletCollision/CollisionShapes/btCylinderShape.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/BulletCollision/CollisionShapes/btCylinderShape.h b/src/BulletCollision/CollisionShapes/btCylinderShape.h index d0a8bd151..f7899265d 100644 --- a/src/BulletCollision/CollisionShapes/btCylinderShape.h +++ b/src/BulletCollision/CollisionShapes/btCylinderShape.h @@ -154,10 +154,6 @@ public: virtual btVector3 localGetSupportingVertexWithoutMargin(const btVector3& vec)const; virtual void batchedUnitVectorGetSupportingVertexWithoutMargin(const btVector3* vectors,btVector3* supportVerticesOut,int numVectors) const; - virtual int getUpAxis() const - { - return 2; - } //debugging virtual const char* getName()const {