diff options
| author | Erwin Coumans <blender@erwincoumans.com> | 2006-11-29 08:25:37 +0300 |
|---|---|---|
| committer | Erwin Coumans <blender@erwincoumans.com> | 2006-11-29 08:25:37 +0300 |
| commit | e91d6895bd201d6539df9cac36473fd463eced6e (patch) | |
| tree | 6413307a3da2e393cb057a333c00e09453301bce /source/gameengine/Physics | |
| parent | e720f86a836b9343388beafb56be5be9956a3629 (diff) | |
updated to latest Bullet Physics
Diffstat (limited to 'source/gameengine/Physics')
| -rw-r--r-- | source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp index 7e43d36e322..f99a24d026e 100644 --- a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp +++ b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp @@ -535,7 +535,7 @@ void CcdPhysicsEnvironment::setLinearAirDamping(float damping) void CcdPhysicsEnvironment::setUseEpa(bool epa) { - gUseEpa = epa; + //gUseEpa = epa; } void CcdPhysicsEnvironment::setSolverType(int solverType) @@ -1000,8 +1000,8 @@ int CcdPhysicsEnvironment::createConstraint(class PHY_IPhysicsController* ctrl return 0; - ASSERT(rb0); - + btAssert(0); + btVector3 pivotInA(pivotX,pivotY,pivotZ); btVector3 pivotInB = rb1 ? rb1->getCenterOfMassTransform().inverse()(rb0->getCenterOfMassTransform()(pivotInA)) : pivotInA; btVector3 axisInA(axisX,axisY,axisZ); |