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

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

View file

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