From 27ed0c4a9866ab4ddcb67f3f1fd4e3164bbf869b Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Wed, 22 Apr 2015 13:21:06 -0700 Subject: [PATCH] experimenting --- libraries/physics/src/PhysicsEngine.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libraries/physics/src/PhysicsEngine.cpp b/libraries/physics/src/PhysicsEngine.cpp index 3033ff5973..f33933fb3f 100644 --- a/libraries/physics/src/PhysicsEngine.cpp +++ b/libraries/physics/src/PhysicsEngine.cpp @@ -405,7 +405,9 @@ void PhysicsEngine::computeCollisionEvents() { entityA->setShouldClaimSimulationOwnership(true); } - if (entityA && entityB) { + if (entityA && entityB && + !objectA->isStaticOrKinematicObject() && + !objectB->isStaticOrKinematicObject()) { if (entityA->getShouldClaimSimulationOwnership()) { entityB->setShouldClaimSimulationOwnership(true); }