From 10e53783964feed07b76272d32da43eca8ee0dc8 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Thu, 23 Apr 2015 09:13:18 -0700 Subject: [PATCH] fix mangled if --- libraries/physics/src/PhysicsEngine.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/physics/src/PhysicsEngine.cpp b/libraries/physics/src/PhysicsEngine.cpp index 0a122c5fd6..f187f5727d 100644 --- a/libraries/physics/src/PhysicsEngine.cpp +++ b/libraries/physics/src/PhysicsEngine.cpp @@ -410,9 +410,9 @@ void PhysicsEngine::computeCollisionEvents() { entityMotionStateB->setShouldClaimSimulationOwnership(true); } if (entityB->getSimulatorID() == myNodeID || - entityMotionStateA->getShouldClaimSimulationOwnership() || + entityMotionStateB->getShouldClaimSimulationOwnership() || objectB == characterCollisionObject) { - entityMotionStateB->setShouldClaimSimulationOwnership(true); + entityMotionStateA->setShouldClaimSimulationOwnership(true); } } }