Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 20:11:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix near-grab to equip handoff

Browse source
This commit is contained in:
Seth Alves 2017-01-24 11:39:26 -08:00
parent 48898f41b2
commit df9bc91f01
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
interface/src/avatar/AvatarActionHold.cpp
View file

@ -235,6 +235,11 @@ void AvatarActionHold::doKinematicUpdate(float deltaTimeStep) {
qDebug() << "AvatarActionHold::doKinematicUpdate -- no owning entity"; qDebug() << "AvatarActionHold::doKinematicUpdate -- no owning entity";
return; return;
} }
if (ownerEntity->getParentID() != QUuid()) {
// if the held entity has been given a parent, stop acting on it.
return;
}
void* physicsInfo = ownerEntity->getPhysicsInfo(); void* physicsInfo = ownerEntity->getPhysicsInfo();
if (!physicsInfo) { if (!physicsInfo) {
qDebug() << "AvatarActionHold::doKinematicUpdate -- no owning physics info"; qDebug() << "AvatarActionHold::doKinematicUpdate -- no owning physics info";