From e6e39cce0e9140de96febc3aba3d709cdffe8de1 Mon Sep 17 00:00:00 2001
From: rdb <git@rdb.name>
Date: Fri, 20 Apr 2018 12:48:57 +0200
Subject: [PATCH] bullet: fix deadlock in get_manifold

---
 panda/src/bullet/bulletWorld.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/panda/src/bullet/bulletWorld.cxx b/panda/src/bullet/bulletWorld.cxx
index 9bfa707e9d..9732760460 100644
--- a/panda/src/bullet/bulletWorld.cxx
+++ b/panda/src/bullet/bulletWorld.cxx
@@ -1052,7 +1052,7 @@ BulletPersistentManifold *BulletWorld::
 get_manifold(int idx) const {
   LightMutexHolder holder(get_global_lock());
 
-  nassertr(idx < get_num_manifolds(), NULL);
+  nassertr(idx < _dispatcher->getNumManifolds(), NULL);
 
   btPersistentManifold *ptr = _dispatcher->getManifoldByIndexInternal(idx);
   return (ptr) ? new BulletPersistentManifold(ptr) : NULL;