Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 06:03:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'avatar-interaction' of ssh://github.com/AndrewMeadows/hifi into avatar-interaction

Browse source
This commit is contained in:
Andrew Meadows 2014-02-12 08:31:05 -08:00
commit cc70e099bf
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/renderer/Model.cpp
View file

@ -725,9 +725,7 @@ void Model::renderCollisionProxies(float alpha) {
bool Model::collisionHitsMoveableJoint(ModelCollisionInfo& collision) const { bool Model::collisionHitsMoveableJoint(ModelCollisionInfo& collision) const {
// the joint is pokable by a collision if it exists and is free to move // the joint is pokable by a collision if it exists and is free to move
const FBXJoint& joint = _geometry->getFBXGeometry().joints[collision._jointIndex]; const FBXJoint& joint = _geometry->getFBXGeometry().joints[collision._jointIndex];
if (joint.parentIndex == -1 || if (joint.parentIndex == -1 || _jointStates.isEmpty()) {
_jointStates.isEmpty())
{
return false; return false;
} }
// an empty freeLineage means the joint can't move // an empty freeLineage means the joint can't move