Merge remote branch 'gus/master'

zinnschlag · Feb 10, 2012 · 4a188f2 · 4a188f2
2 parents 6c7e5d0 + 8affa30
commit 4a188f2
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/bullet/physic.cpp b/bullet/physic.cpp
@@ -157,7 +157,7 @@ namespace Physic
 
         //TODO: memory leak?
         btOverlappingPairCache* pairCache = new btSortedOverlappingPairCache();
-        pairCache->setInternalGhostPairCallback( new btGhostPairCallback() );
+        //pairCache->setInternalGhostPairCallback( new btGhostPairCallback() );
 
         broadphase = new btDbvtBroadphase(pairCache);