From f7092c076775ff9dc63e7d5b45ff37a3a93c11c0 Mon Sep 17 00:00:00 2001
From: "erwin.coumans" <erwin.coumans@08e121b0-ae19-0410-a57b-3be3395fd4fd>
Date: Fri, 6 Feb 2009 05:02:33 +0000
Subject: [PATCH] version update to 2.74

---
 VERSION                                          |  2 +-
 config.h.in                                      |  4 ----
 configure.ac                                     |  2 +-
 .../ConstraintSolver/btConeTwistConstraint.cpp   | 16 ++++++++++------
 src/LinearMath/btScalar.h                        |  2 +-
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/VERSION b/VERSION
index ae0a2e981..2db806a13 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.73
\ No newline at end of file
+2.74
diff --git a/config.h.in b/config.h.in
index 2f10be9b4..6c30c429a 100644
--- a/config.h.in
+++ b/config.h.in
@@ -60,10 +60,6 @@
 /* Define to 1 if you have the <windows.h> header file. */
 #undef HAVE_WINDOWS_H
 
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
-   */
-#undef LT_OBJDIR
-
 /* Name of package */
 #undef PACKAGE
 
diff --git a/configure.ac b/configure.ac
index 4c770c9d2..c2822400b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ AC_PREREQ([2.54])
 #----------------------------------------------------------------------------
 AC_INIT(
     [bullet],
-    [2.73],
+    [2.74],
     [bullet@erwincoumans.com])
 AC_CANONICAL_HOST
 CS_PACKAGEINFO(
diff --git a/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp b/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp
index 8c73c157f..f7747fcac 100644
--- a/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp
+++ b/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp
@@ -291,10 +291,13 @@ void	btConeTwistConstraint::solveConstraintObsolete(btSolverBody& bodyA,btSolver
 			btTransform trBCur = m_rbB.getCenterOfMassTransform();
 			btVector3 omegaA; bodyA.getAngularVelocity(omegaA);
 			btVector3 omegaB; bodyB.getAngularVelocity(omegaB);
-			btTransform trAPred; trAPred.setIdentity(); btTransformUtil::integrateTransform(
-				trACur, btVector3(0,0,0), omegaA, timeStep, trAPred);
-			btTransform trBPred; trBPred.setIdentity(); btTransformUtil::integrateTransform(
-				trBCur, btVector3(0,0,0), omegaB, timeStep, trBPred);
+			btTransform trAPred; trAPred.setIdentity(); 
+			btVector3 zerovec(0,0,0);
+			btTransformUtil::integrateTransform(
+				trACur, zerovec, omegaA, timeStep, trAPred);
+			btTransform trBPred; trBPred.setIdentity(); 
+			btTransformUtil::integrateTransform(
+				trBCur, zerovec, omegaB, timeStep, trBPred);
 
 			// compute desired transforms in world
 			btTransform trPose(m_qTarget);
@@ -304,8 +307,9 @@ void	btConeTwistConstraint::solveConstraintObsolete(btSolverBody& bodyA,btSolver
 
 			// compute desired omegas in world
 			btVector3 omegaADes, omegaBDes;
-			btTransformUtil::calculateVelocity(trACur, trADes, timeStep, btVector3(0,0,0), omegaADes);
-			btTransformUtil::calculateVelocity(trBCur, trBDes, timeStep, btVector3(0,0,0), omegaBDes);
+			
+			btTransformUtil::calculateVelocity(trACur, trADes, timeStep, zerovec, omegaADes);
+			btTransformUtil::calculateVelocity(trBCur, trBDes, timeStep, zerovec, omegaBDes);
 
 			// compute delta omegas
 			btVector3 dOmegaA = omegaADes - omegaA;
diff --git a/src/LinearMath/btScalar.h b/src/LinearMath/btScalar.h
index 71126e6e7..71cf13467 100644
--- a/src/LinearMath/btScalar.h
+++ b/src/LinearMath/btScalar.h
@@ -25,7 +25,7 @@ subject to the following restrictions:
 #include <cfloat>
 #include <float.h>
 
-#define BT_BULLET_VERSION 273
+#define BT_BULLET_VERSION 274
 
 inline int	btGetVersion()
 {