Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErwin Coumans <blender@erwincoumans.com>2007-07-06 07:12:31 +0400
committerErwin Coumans <blender@erwincoumans.com>2007-07-06 07:12:31 +0400
commit376be529bb932f867b01466592c33899ee5ec2c8 (patch)
treee89c72da658f04ed4aa816ada6adabfb5d938b74 /extern/bullet2/src/BulletCollision/CollisionShapes/btMinkowskiSumShape.h
parentcff039bc58fe2ed54d4dad0828f5dede0b26a206 (diff)
synchronized to latest version of Bullet. added btConeTwistConstraint (useful for ragdolls etc)
Diffstat (limited to 'extern/bullet2/src/BulletCollision/CollisionShapes/btMinkowskiSumShape.h')
-rw-r--r--extern/bullet2/src/BulletCollision/CollisionShapes/btMinkowskiSumShape.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btMinkowskiSumShape.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btMinkowskiSumShape.h
index 489b7ddde1e..198faaff9f9 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btMinkowskiSumShape.h
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btMinkowskiSumShape.h
@@ -25,12 +25,12 @@ class btMinkowskiSumShape : public btConvexShape
btTransform m_transA;
btTransform m_transB;
- btConvexShape* m_shapeA;
- btConvexShape* m_shapeB;
+ const btConvexShape* m_shapeA;
+ const btConvexShape* m_shapeB;
public:
- btMinkowskiSumShape(btConvexShape* shapeA,btConvexShape* shapeB);
+ btMinkowskiSumShape(const btConvexShape* shapeA,const btConvexShape* shapeB);
virtual btVector3 localGetSupportingVertexWithoutMargin(const btVector3& vec)const;