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:
authorChris Want <cwant@ualberta.ca>2006-04-16 23:34:49 +0400
committerChris Want <cwant@ualberta.ca>2006-04-16 23:34:49 +0400
commit176641b2730084ae279e1567af92d5e493c60f03 (patch)
treeb46a84993859b66ecaae930330427446eaa5abbc
parent1c89ae39cce31834d22124237b8071c46365418a (diff)
==Something very minor==
To get blender to build I needed to comment out: #include "NarrowPhaseCollision/EpaPenetrationDepthSolver.h" Erwin, please check.
-rw-r--r--extern/bullet/Bullet/CollisionDispatch/ConvexConvexAlgorithm.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/extern/bullet/Bullet/CollisionDispatch/ConvexConvexAlgorithm.cpp b/extern/bullet/Bullet/CollisionDispatch/ConvexConvexAlgorithm.cpp
index 6573386681e..443899e62a3 100644
--- a/extern/bullet/Bullet/CollisionDispatch/ConvexConvexAlgorithm.cpp
+++ b/extern/bullet/Bullet/CollisionDispatch/ConvexConvexAlgorithm.cpp
@@ -39,7 +39,7 @@ subject to the following restrictions:
#include "NarrowPhaseCollision/MinkowskiPenetrationDepthSolver.h"
-#include "NarrowPhaseCollision/EpaPenetrationDepthSolver.h"
+//#include "NarrowPhaseCollision/EpaPenetrationDepthSolver.h"
#ifdef WIN32
#if _MSC_VER >= 1310