From 7b1f30f1cf7e789fc573fb761ef068561a0d18a9 Mon Sep 17 00:00:00 2001 From: "john.mccutchan" Date: Wed, 8 Oct 2008 16:53:56 +0000 Subject: [PATCH] btGjkEpa2 should call getMarginNonVirtual instead of getMargin() --- src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.cpp b/src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.cpp index e410fed05..859c210b6 100644 --- a/src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.cpp +++ b/src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.cpp @@ -885,8 +885,8 @@ if(gjk_status==GJK::eStatus::Valid) results.witnesses[1] = wtrs0*w1; const btVector3 delta= results.witnesses[1]- results.witnesses[0]; - const btScalar margin= shape0->getMargin()+ - shape1.getMargin(); + const btScalar margin= shape0->getMarginNonVirtual()+ + shape1.getMarginNonVirtual(); const btScalar length= delta.length(); results.normal = delta/length; results.witnesses[0] += results.normal*margin;