From 0d76b370df7e8f9dba616f6e185645b49023869a Mon Sep 17 00:00:00 2001 From: Philip Rosedale Date: Mon, 16 Dec 2013 17:01:46 -0800 Subject: [PATCH] only check palms if active --- interface/src/avatar/Hand.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/interface/src/avatar/Hand.cpp b/interface/src/avatar/Hand.cpp index aec55d1579..bbd7527a0b 100755 --- a/interface/src/avatar/Hand.cpp +++ b/interface/src/avatar/Hand.cpp @@ -299,6 +299,9 @@ void Hand::updateCollisions() { palm.setIsCollidingWithPalm(false); for (int j = 0; j < getNumPalms(); j++) { PalmData& otherPalm = otherAvatar->getHand().getPalms()[j]; + if (!otherPalm.isActive()) { + continue; + } glm::vec3 otherPalmPosition = otherPalm.getPosition(); if (glm::length(otherPalmPosition - myPalmPosition) < palmCollisionDistance) { palm.setIsCollidingWithPalm(true);