From e546ef23a8de8b9f958de95ba2d18740577cec80 Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Fri, 6 Sep 2019 08:57:10 -0700 Subject: [PATCH] don't bid for sim ownership of kinematic unless grabbed --- libraries/physics/src/EntityMotionState.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libraries/physics/src/EntityMotionState.cpp b/libraries/physics/src/EntityMotionState.cpp index 67aa7d2d7d..68c8266e9f 100644 --- a/libraries/physics/src/EntityMotionState.cpp +++ b/libraries/physics/src/EntityMotionState.cpp @@ -740,7 +740,8 @@ bool EntityMotionState::shouldSendBid() const { && (_region == workload::Region::R1) && _ownershipState != EntityMotionState::OwnershipState::Unownable && glm::max(glm::max(VOLUNTEER_SIMULATION_PRIORITY, _bumpedPriority), _entity->getScriptSimulationPriority()) >= _entity->getSimulationPriority() - && !_entity->getLocked(); + && !_entity->getLocked() + && (!_body->isStaticOrKinematicObject() || _entity->stillHasMyGrab()); } void EntityMotionState::setRigidBody(btRigidBody* body) {