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>2006-04-13 18:41:18 +0400
committerErwin Coumans <blender@erwincoumans.com>2006-04-13 18:41:18 +0400
commit80313105d91d5a646895e28ab5d702f27a2d83d7 (patch)
treeb381863889c0cb6abb83b282a99cd1b956963069 /extern/bullet
parent3c666e751f5f54777efa99fb253773f4b2c6bfe9 (diff)
don't use Epa yet
Diffstat (limited to 'extern/bullet')
-rw-r--r--extern/bullet/Bullet/CollisionDispatch/ConvexConvexAlgorithm.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/extern/bullet/Bullet/CollisionDispatch/ConvexConvexAlgorithm.cpp b/extern/bullet/Bullet/CollisionDispatch/ConvexConvexAlgorithm.cpp
index c138d5a140e..6573386681e 100644
--- a/extern/bullet/Bullet/CollisionDispatch/ConvexConvexAlgorithm.cpp
+++ b/extern/bullet/Bullet/CollisionDispatch/ConvexConvexAlgorithm.cpp
@@ -151,7 +151,7 @@ public:
static MinkowskiPenetrationDepthSolver gPenetrationDepthSolver;
-static EpaPenetrationDepthSolver gEpaPenetrationDepthSolver;
+//static EpaPenetrationDepthSolver gEpaPenetrationDepthSolver;
#ifdef USE_EPA
Solid3EpaPenetrationDepth gSolidEpaPenetrationSolver;
@@ -165,7 +165,7 @@ void ConvexConvexAlgorithm::CheckPenetrationDepthSolver()
if (m_useEpa)
{
- m_gjkPairDetector.SetPenetrationDepthSolver(&gEpaPenetrationDepthSolver);
+ // m_gjkPairDetector.SetPenetrationDepthSolver(&gEpaPenetrationDepthSolver);
} else