TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-02 09:52:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

bullet: fix deadlock in get_manifold

Browse Source
This commit is contained in:
rdb 2018-04-20 12:48:57 +02:00
parent fc172f8918
commit e6e39cce0e
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
panda/src/bullet/bulletWorld.cxx
View File

@ -1052,7 +1052,7 @@ BulletPersistentManifold *BulletWorld::
get_manifold(int idx) const { get_manifold(int idx) const {
LightMutexHolder holder(get_global_lock()); LightMutexHolder holder(get_global_lock());
nassertr(idx < get_num_manifolds(), NULL); nassertr(idx < _dispatcher->getNumManifolds(), NULL);
btPersistentManifold *ptr = _dispatcher->getManifoldByIndexInternal(idx); btPersistentManifold *ptr = _dispatcher->getManifoldByIndexInternal(idx);
return (ptr) ? new BulletPersistentManifold(ptr) : NULL; return (ptr) ? new BulletPersistentManifold(ptr) : NULL;