diff options
Diffstat (limited to 'extern/bullet/BulletDynamics/CollisionDispatch/ConvexConcaveCollisionAlgorithm.cpp')
| -rw-r--r-- | extern/bullet/BulletDynamics/CollisionDispatch/ConvexConcaveCollisionAlgorithm.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/extern/bullet/BulletDynamics/CollisionDispatch/ConvexConcaveCollisionAlgorithm.cpp b/extern/bullet/BulletDynamics/CollisionDispatch/ConvexConcaveCollisionAlgorithm.cpp index 6a815cb3113..54cbd6ca5d6 100644 --- a/extern/bullet/BulletDynamics/CollisionDispatch/ConvexConcaveCollisionAlgorithm.cpp +++ b/extern/bullet/BulletDynamics/CollisionDispatch/ConvexConcaveCollisionAlgorithm.cpp @@ -115,7 +115,7 @@ void BoxTriangleCallback::SetTimeStepAndCounters(float timeStep,int stepCount,fl boxBody->GetCollisionShape()->GetAabb(boxInTriangleSpace,m_aabbMin,m_aabbMax); - float extraMargin = CONVEX_DISTANCE_MARGIN+0.1f; + float extraMargin = CONVEX_DISTANCE_MARGIN;//+0.1f; SimdVector3 extra(extraMargin,extraMargin,extraMargin); @@ -133,7 +133,6 @@ void ConvexConcaveCollisionAlgorithm::ClearCache() void ConvexConcaveCollisionAlgorithm::ProcessCollision (BroadphaseProxy* ,BroadphaseProxy* ,float timeStep,int stepCount,bool useContinuous) { - if (m_concave.GetClientObjectType() == TRIANGLE_MESH_SHAPE_PROXYTYPE) { |