From 134beaf8dc3d64e15408a2fa4e0a9785ab5342f4 Mon Sep 17 00:00:00 2001
From: Erwin Coumans
 <erwincoumans@erwincoumans-macbookpro2.roam.corp.google.com>
Date: Tue, 5 Jun 2018 16:40:41 -0700
Subject: [PATCH] fix uninitialized m_companionId in btMultiBody (only happens
 if sleeping is enabled)

---
 src/BulletDynamics/Featherstone/btMultiBody.cpp                 | 1 +
 src/BulletDynamics/Featherstone/btMultiBodyConstraintSolver.cpp | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/BulletDynamics/Featherstone/btMultiBody.cpp b/src/BulletDynamics/Featherstone/btMultiBody.cpp
index 578814c36..7b30dd12a 100644
--- a/src/BulletDynamics/Featherstone/btMultiBody.cpp
+++ b/src/BulletDynamics/Featherstone/btMultiBody.cpp
@@ -112,6 +112,7 @@ btMultiBody::btMultiBody(int n_links,
 		m_userObjectPointer(0),
 		m_userIndex2(-1),
 		m_userIndex(-1),
+		m_companionId(-1),
 		m_linearDamping(0.04f),
 		m_angularDamping(0.04f),
 		m_useGyroTerm(true),
diff --git a/src/BulletDynamics/Featherstone/btMultiBodyConstraintSolver.cpp b/src/BulletDynamics/Featherstone/btMultiBodyConstraintSolver.cpp
index c8f7fb0aa..8c6cb6aa8 100644
--- a/src/BulletDynamics/Featherstone/btMultiBodyConstraintSolver.cpp
+++ b/src/BulletDynamics/Featherstone/btMultiBodyConstraintSolver.cpp
@@ -1664,4 +1664,4 @@ void  btMultiBodyConstraintSolver::solveMultiBodyGroup(btCollisionObject** bodie
 	m_tmpNumMultiBodyConstraints = 0;
 	
 
-}
\ No newline at end of file
+}