From 52edac4ef2c6afb495a60ab1afbc82153ed22dcb Mon Sep 17 00:00:00 2001
From: erwincoumans <erwin.coumans@gmail.com>
Date: Sat, 24 Oct 2015 14:00:53 -0700
Subject: [PATCH] example Collision: catch case where no collision world is
 created

---
 examples/Collision/CollisionTutorialBullet2.cpp             | 5 ++++-
 examples/Collision/Internal/RealTimeBullet3CollisionSdk.cpp | 3 +++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/examples/Collision/CollisionTutorialBullet2.cpp b/examples/Collision/CollisionTutorialBullet2.cpp
index 2d3859ef3..78686a5cb 100644
--- a/examples/Collision/CollisionTutorialBullet2.cpp
+++ b/examples/Collision/CollisionTutorialBullet2.cpp
@@ -245,7 +245,10 @@ public:
 		numNearCallbacks = 0;
 		{
 			BT_PROFILE("plWorldCollide");
-			plWorldCollide(m_collisionSdkHandle,m_collisionWorldHandle,myNearCallback, myUserPtr);
+			if (m_collisionSdkHandle && m_collisionWorldHandle)
+			{
+				plWorldCollide(m_collisionSdkHandle,m_collisionWorldHandle,myNearCallback, myUserPtr);
+			}
 		}
 
 #if 0
diff --git a/examples/Collision/Internal/RealTimeBullet3CollisionSdk.cpp b/examples/Collision/Internal/RealTimeBullet3CollisionSdk.cpp
index b67bc3cba..a1de0fa32 100644
--- a/examples/Collision/Internal/RealTimeBullet3CollisionSdk.cpp
+++ b/examples/Collision/Internal/RealTimeBullet3CollisionSdk.cpp
@@ -3,6 +3,7 @@
 #include "Bullet3Common/b3AlignedObjectArray.h"
 #include "Bullet3Collision/NarrowPhaseCollision/shared/b3Collidable.h"
 #include "Bullet3Collision/NarrowPhaseCollision/shared/b3ConvexPolyhedronData.h"
+#include "Bullet3Collision/BroadPhaseCollision/shared/b3Aabb.h"
 
 //convert the opaque pointer to int
 struct RTB3_ColliderOpaque2Int
@@ -48,6 +49,8 @@ struct RTB3CollisionWorld
 	b3AlignedObjectArray<b3Collidable> m_collidables;
 	
 	b3AlignedObjectArray<b3GpuChildShape> m_childShapes;
+	b3AlignedObjectArray<b3Aabb>	m_localSpaceAabbs;
+	b3AlignedObjectArray<b3Aabb>	m_worldSpaceAabbs;
 	b3AlignedObjectArray<b3GpuFace> m_planeFaces;
 	b3AlignedObjectArray<b3CompoundOverlappingPair> m_compoundOverlappingPairs;
 	int m_nextFreeShapeIndex;