diff options
| author | Andre Susano Pinto <andresusanopinto@gmail.com> | 2008-09-15 18:20:31 +0400 |
|---|---|---|
| committer | Andre Susano Pinto <andresusanopinto@gmail.com> | 2008-09-15 18:20:31 +0400 |
| commit | a1d611e9bd3379dd2c002cd5a895c788962a19a5 (patch) | |
| tree | 3c4bedb765464e1f2deadf2b1124c1228cd3d7e7 /extern/bullet2/src/BulletCollision/CollisionShapes/btMultiSphereShape.cpp | |
| parent | 039ed9cb7f3edd2cae640065979aed4a7eb31103 (diff) | |
svn merge -r 16231:16536 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Diffstat (limited to 'extern/bullet2/src/BulletCollision/CollisionShapes/btMultiSphereShape.cpp')
| -rw-r--r-- | extern/bullet2/src/BulletCollision/CollisionShapes/btMultiSphereShape.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btMultiSphereShape.cpp b/extern/bullet2/src/BulletCollision/CollisionShapes/btMultiSphereShape.cpp index 6015a618082..c709205efc2 100644 --- a/extern/bullet2/src/BulletCollision/CollisionShapes/btMultiSphereShape.cpp +++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btMultiSphereShape.cpp @@ -47,7 +47,7 @@ btMultiSphereShape::btMultiSphereShape (const btVector3& inertiaHalfExtents,cons btVector3 vec = vec0; btScalar lenSqr = vec.length2(); - if (lenSqr < btScalar(0.0001)) + if (lenSqr < (SIMD_EPSILON*SIMD_EPSILON)) { vec.setValue(1,0,0); } else @@ -116,7 +116,7 @@ btMultiSphereShape::btMultiSphereShape (const btVector3& inertiaHalfExtents,cons -void btMultiSphereShape::calculateLocalInertia(btScalar mass,btVector3& inertia) +void btMultiSphereShape::calculateLocalInertia(btScalar mass,btVector3& inertia) const { //as an approximation, take the inertia of the box that bounds the spheres |