Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-23 17:24:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #13988 from sabrina-shanman/crash_bubble-tp

Browse source 
Fix crash when teleporting into avatars with bubble active
This commit is contained in:
John Conklin II 2018-09-13 13:07:31 -07:00 committed by GitHub
commit 28140fc0c0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libraries/physics/src/PhysicsEngine.cpp
View file

@ -286,6 +286,7 @@ void PhysicsEngine::reinsertObject(ObjectMotionState* object) {
void PhysicsEngine::processTransaction(PhysicsEngine::Transaction& transaction) { void PhysicsEngine::processTransaction(PhysicsEngine::Transaction& transaction) {
// removes // removes
for (auto object : transaction.objectsToRemove) { for (auto object : transaction.objectsToRemove) {
bumpAndPruneContacts(object);
btRigidBody* body = object->getRigidBody(); btRigidBody* body = object->getRigidBody();
if (body) { if (body) {
removeDynamicsForBody(body); removeDynamicsForBody(body);