bullet: Fix deadlock when contact added callback accesses certain dat…

…a or executes bullet methods
panda3d · Nov 19, 2023 · 3097d26 · 3097d26
1 parent f9a86bc
commit 3097d26
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/panda/src/bullet/bulletContactCallbacks.h b/panda/src/bullet/bulletContactCallbacks.h
@@ -88,7 +88,12 @@ contact_added_callback(btManifoldPoint &cp,
       BulletManifoldPoint mp(cp);
       BulletContactCallbackData cbdata(mp, node0, node1, id0, id1, index0, index1);
 
+      // Release the world mutex object so that bullet methods can be called from the callback.
+      LightMutex &mutex = BulletWorld::get_global_lock();
+
+      mutex.release();
       bullet_contact_added_callback->do_callback(&cbdata);
+      mutex.acquire();
     }
   }