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:
Diffstat (limited to 'extern/bullet/Bullet/NarrowPhaseCollision/GjkPairDetector.cpp')
-rw-r--r--extern/bullet/Bullet/NarrowPhaseCollision/GjkPairDetector.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/extern/bullet/Bullet/NarrowPhaseCollision/GjkPairDetector.cpp b/extern/bullet/Bullet/NarrowPhaseCollision/GjkPairDetector.cpp
index 07502e53d55..e374e1c1bc0 100644
--- a/extern/bullet/Bullet/NarrowPhaseCollision/GjkPairDetector.cpp
+++ b/extern/bullet/Bullet/NarrowPhaseCollision/GjkPairDetector.cpp
@@ -139,8 +139,9 @@ void GjkPairDetector::GetClosestPoints(const ClosestPointInput& input,Result& ou
if (checkPenetration && !isValid)
{
//penetration case
- m_minkowskiA->SetMargin(marginA);
- m_minkowskiB->SetMargin(marginB);
+
+ //m_minkowskiA->SetMargin(marginA);
+ //m_minkowskiB->SetMargin(marginB);
//if there is no way to handle penetrations, bail out
if (m_penetrationDepthSolver)