From 5acda2d06c34fba364a9ba2e35bb7e7632f17f65 Mon Sep 17 00:00:00 2001 From: "erwin.coumans" Date: Wed, 21 Oct 2009 19:47:52 +0000 Subject: [PATCH] move an __SPU__ conditional around the virtual methods, we need some of the other inline methods. --- src/BulletCollision/CollisionShapes/btCollisionShape.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/BulletCollision/CollisionShapes/btCollisionShape.h b/src/BulletCollision/CollisionShapes/btCollisionShape.h index 215758ef5..f20245113 100644 --- a/src/BulletCollision/CollisionShapes/btCollisionShape.h +++ b/src/BulletCollision/CollisionShapes/btCollisionShape.h @@ -53,7 +53,7 @@ public: ///result is conservative void calculateTemporalAabb(const btTransform& curTrans,const btVector3& linvel,const btVector3& angvel,btScalar timeStep, btVector3& temporalAabbMin,btVector3& temporalAabbMax) const; -#ifndef __SPU__ + SIMD_FORCE_INLINE bool isPolyhedral() const { @@ -84,7 +84,7 @@ public: return btBroadphaseProxy::isInfinite(getShapeType()); } - +#ifndef __SPU__ virtual void setLocalScaling(const btVector3& scaling) =0; virtual const btVector3& getLocalScaling() const =0; virtual void calculateLocalInertia(btScalar mass,btVector3& inertia) const = 0;