From 51036713f071d2c68fbd8c0038a1531ee16c1504 Mon Sep 17 00:00:00 2001 From: erwincoumans Date: Wed, 29 Jan 2014 05:47:45 -0800 Subject: [PATCH] Initialize 64bit user pointer, thanks to AndresTraks See https://github.com/erwincoumans/bullet3/issues/33 --- src/Bullet3Dynamics/ConstraintSolver/b3TypedConstraint.cpp | 2 +- src/BulletDynamics/ConstraintSolver/btTypedConstraint.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Bullet3Dynamics/ConstraintSolver/b3TypedConstraint.cpp b/src/Bullet3Dynamics/ConstraintSolver/b3TypedConstraint.cpp index dad4d5f82..699c481d6 100644 --- a/src/Bullet3Dynamics/ConstraintSolver/b3TypedConstraint.cpp +++ b/src/Bullet3Dynamics/ConstraintSolver/b3TypedConstraint.cpp @@ -25,7 +25,7 @@ subject to the following restrictions: b3TypedConstraint::b3TypedConstraint(b3TypedConstraintType type, int rbA,int rbB) :b3TypedObject(type), m_userConstraintType(-1), -m_userConstraintId(-1), +m_userConstraintPtr((void*)-1), m_breakingImpulseThreshold(B3_INFINITY), m_isEnabled(true), m_needsFeedback(false), diff --git a/src/BulletDynamics/ConstraintSolver/btTypedConstraint.cpp b/src/BulletDynamics/ConstraintSolver/btTypedConstraint.cpp index 27fdd9d3d..736a64a1c 100644 --- a/src/BulletDynamics/ConstraintSolver/btTypedConstraint.cpp +++ b/src/BulletDynamics/ConstraintSolver/btTypedConstraint.cpp @@ -24,7 +24,7 @@ subject to the following restrictions: btTypedConstraint::btTypedConstraint(btTypedConstraintType type, btRigidBody& rbA) :btTypedObject(type), m_userConstraintType(-1), -m_userConstraintId(-1), +m_userConstraintPtr((void*)-1), m_breakingImpulseThreshold(SIMD_INFINITY), m_isEnabled(true), m_needsFeedback(false), @@ -41,7 +41,7 @@ m_jointFeedback(0) btTypedConstraint::btTypedConstraint(btTypedConstraintType type, btRigidBody& rbA,btRigidBody& rbB) :btTypedObject(type), m_userConstraintType(-1), -m_userConstraintId(-1), +m_userConstraintPtr((void*)-1), m_breakingImpulseThreshold(SIMD_INFINITY), m_isEnabled(true), m_needsFeedback(false),