From 25ee137390f57c8df97ebc3e3b3f5c80cd5c667d Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Mon, 16 Nov 2015 15:48:08 -0800
Subject: [PATCH] Fix missing colObjWrap

---
 .../CollisionDispatch/btCollisionWorld.cpp    | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp b/src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp
index f407260e3..f0b57f0a2 100644
--- a/src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp
+++ b/src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp
@@ -796,14 +796,16 @@ void	btCollisionWorld::objectQuerySingleInternal(const btConvexShape* castShape,
                 struct	btCompoundLeafCallback : btDbvt::ICollide
                 {
                     btCompoundLeafCallback(
-                        const btConvexShape* castShape,
-                        const btTransform& convexFromTrans,
-                        const btTransform& convexToTrans,
-                        btScalar allowedPenetration,
-                        const btCompoundShape* compoundShape,
-                        const btTransform& colObjWorldTransform,
-                        ConvexResultCallback& resultCallback)
-                        : 
+                                           const btCollisionObjectWrapper* colObjWrap,
+                                           const btConvexShape* castShape,
+                                           const btTransform& convexFromTrans,
+                                           const btTransform& convexToTrans,
+                                           btScalar allowedPenetration,
+                                           const btCompoundShape* compoundShape,
+                                           const btTransform& colObjWorldTransform,
+                                           ConvexResultCallback& resultCallback)
+                    : 
+                      m_colObjWrap(colObjWrap),
                         m_castShape(castShape),
                         m_convexFromTrans(convexFromTrans),
                         m_convexToTrans(convexToTrans),
@@ -813,6 +815,7 @@ void	btCollisionWorld::objectQuerySingleInternal(const btConvexShape* castShape,
                         m_resultCallback(resultCallback) {
                     }
 
+                  const btCollisionObjectWrapper* m_colObjWrap;
                     const btConvexShape* m_castShape;
                     const btTransform& m_convexFromTrans;
                     const btTransform& m_convexToTrans;
@@ -820,7 +823,6 @@ void	btCollisionWorld::objectQuerySingleInternal(const btConvexShape* castShape,
                     const btCompoundShape* m_compoundShape;
                     const btTransform& m_colObjWorldTransform;
                     ConvexResultCallback& m_resultCallback;
-                    const btCollisionObjectWrapper* m_colObjWrap;
 
                 public:
 
@@ -885,7 +887,7 @@ void	btCollisionWorld::objectQuerySingleInternal(const btConvexShape* castShape,
                 const btDbvt* tree = compoundShape->getDynamicAabbTree();
 
                 if (tree) {
-                    btCompoundLeafCallback callback { castShape, convexFromTrans, convexToTrans,
+                  btCompoundLeafCallback callback { colObjWrap, castShape, convexFromTrans, convexToTrans,
                         allowedPenetration, compoundShape, colObjWorldTransform, resultCallback };
                     const ATTRIBUTE_ALIGNED16(btDbvtVolume)	bounds = btDbvtVolume::FromMM(fromLocalAabbMin, fromLocalAabbMax);
                     tree->collideTV(tree->m_root, bounds, callback);