From 323df8f85be7ba3c3a55c14823b9788c0eb7d337 Mon Sep 17 00:00:00 2001
From: id0x1234 <id0x1234@08e121b0-ae19-0410-a57b-3be3395fd4fd>
Date: Sun, 21 Sep 2008 02:21:22 +0000
Subject: [PATCH] btDbvtBroadphase, fixed missed pairs when m_deferred collide
 was set to false.

---
 src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.cpp | 3 ++-
 src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.h   | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.cpp b/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.cpp
index 234f30fea..4ab88e921 100644
--- a/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.cpp
+++ b/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.cpp
@@ -164,7 +164,7 @@ btBroadphaseProxy*				btDbvtBroadphase::createProxy(	const btVector3& aabbMin,
 																void* userPtr,
 																short int collisionFilterGroup,
 																short int collisionFilterMask,
-																btDispatcher* dispatcher,
+																btDispatcher* /*dispatcher*/,
 																void* /*multiSapProxy*/)
 {
 btDbvtProxy*		proxy=new(btAlignedAlloc(sizeof(btDbvtProxy),16)) btDbvtProxy(	userPtr,
@@ -180,6 +180,7 @@ if(!m_deferedcollide)
 	btDbvtTreeCollider	collider(this);
 	collider.proxy=proxy;
 	btDbvt::collideTV(m_sets[0].m_root,proxy->aabb,collider);
+	btDbvt::collideTV(m_sets[1].m_root,proxy->aabb,collider);
 	}
 return(proxy);
 }
diff --git a/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.h b/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.h
index f401f6cba..556d02e00 100644
--- a/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.h
+++ b/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.h
@@ -86,7 +86,6 @@ int						m_gid;						// Gen id
 bool					m_releasepaircache;			// Release pair cache on delete
 bool					m_deferedcollide;			// Defere dynamic/static collision to collide call
 bool					m_needcleanup;				// Need to run cleanup?
-bool					m_initialize;				// Initialization
 #if DBVT_BP_PROFILE
 btClock					m_clock;
 struct	{