From ad36e23c34bb4e002d2e44562c50202a2f10b7e3 Mon Sep 17 00:00:00 2001 From: sabrina-shanman Date: Thu, 9 Aug 2018 17:00:54 -0700 Subject: [PATCH] Return early when colliding MyAvatar is found in AllContactsCallback --- libraries/physics/src/PhysicsEngine.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/libraries/physics/src/PhysicsEngine.cpp b/libraries/physics/src/PhysicsEngine.cpp index 95004f8b2a..bcd717b9e9 100644 --- a/libraries/physics/src/PhysicsEngine.cpp +++ b/libraries/physics/src/PhysicsEngine.cpp @@ -888,6 +888,7 @@ struct AllContactsCallback : public btCollisionWorld::ContactResultCallback { // TODO: Give MyAvatar a motion state so we don't have to do this if (desiredObjectType == MOTIONSTATE_TYPE_AVATAR && myAvatarCollisionObject && myAvatarCollisionObject == otherBody) { contacts.emplace_back(Physics::getSessionUUID(), bulletToGLM(penetrationPoint), bulletToGLM(otherPenetrationPoint)); + return 0; } if (!(otherBody->getInternalType() & btCollisionObject::CO_RIGID_BODY)) {