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:
authorKen Hughes <khughes@pacific.edu>2008-02-03 04:33:35 +0300
committerKen Hughes <khughes@pacific.edu>2008-02-03 04:33:35 +0300
commit0a27a319708a0492b0f41b5711e7a38a445e62b9 (patch)
treed94662da0c1978a71ba36a2459bc38332ca11318 /extern/bullet2/src/BulletDynamics
parent87fbe307a1986c44620f54c20187eb83ff5f5533 (diff)
Clean-up for various gcc warnings under linux.
Diffstat (limited to 'extern/bullet2/src/BulletDynamics')
-rw-r--r--extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp1
-rw-r--r--extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.cpp2
2 files changed, 1 insertions, 2 deletions
diff --git a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp
index 12a33d7851e..2289621e8e3 100644
--- a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp
+++ b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp
@@ -205,7 +205,6 @@ void btConeTwistConstraint::solveConstraint(btScalar timeStep)
btVector3 pivotBInW = m_rbB.getCenterOfMassTransform()*m_rbBFrame.getOrigin();
btScalar tau = btScalar(0.3);
- btScalar damping = btScalar(1.);
//linear part
if (!m_angularOnly)
diff --git a/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.cpp b/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.cpp
index 02cf44d0cfa..9ed3579d89c 100644
--- a/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.cpp
+++ b/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.cpp
@@ -342,4 +342,4 @@ void btRigidBody::removeConstraintRef(btTypedConstraint* c)
{
m_constraintRefs.remove(c);
m_checkCollideWith = m_constraintRefs.size() > 0;
-} \ No newline at end of file
+}