From df9bc91f01e052c3c695bbb24e2ab144549ec812 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Tue, 24 Jan 2017 11:39:26 -0800 Subject: [PATCH] fix near-grab to equip handoff --- interface/src/avatar/AvatarActionHold.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/interface/src/avatar/AvatarActionHold.cpp b/interface/src/avatar/AvatarActionHold.cpp index bb61074e73..7f58c86aec 100644 --- a/interface/src/avatar/AvatarActionHold.cpp +++ b/interface/src/avatar/AvatarActionHold.cpp @@ -235,6 +235,11 @@ void AvatarActionHold::doKinematicUpdate(float deltaTimeStep) { qDebug() << "AvatarActionHold::doKinematicUpdate -- no owning entity"; return; } + if (ownerEntity->getParentID() != QUuid()) { + // if the held entity has been given a parent, stop acting on it. + return; + } + void* physicsInfo = ownerEntity->getPhysicsInfo(); if (!physicsInfo) { qDebug() << "AvatarActionHold::doKinematicUpdate -- no owning physics info";