From a43e9a5710ed90d07dd596a701a8c9ebe98a294c Mon Sep 17 00:00:00 2001
From: Anthony Thibault <ajt@hyperlogic.org>
Date: Fri, 22 Jul 2016 16:00:40 -0700
Subject: [PATCH] Fix for crash on avatars with missing "Hips" joint

---
 libraries/animation/src/AnimInverseKinematics.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/libraries/animation/src/AnimInverseKinematics.cpp b/libraries/animation/src/AnimInverseKinematics.cpp
index 971694bfa8..95ca493058 100644
--- a/libraries/animation/src/AnimInverseKinematics.cpp
+++ b/libraries/animation/src/AnimInverseKinematics.cpp
@@ -861,7 +861,11 @@ void AnimInverseKinematics::setSkeletonInternal(AnimSkeleton::ConstPointer skele
         _hipsIndex = _skeleton->nameToJointIndex("Hips");
 
         // also cache the _hipsParentIndex for later
-        _hipsParentIndex = _skeleton->getParentIndex(_hipsIndex);
+        if (_hipsIndex >= 0) {
+            _hipsParentIndex = _skeleton->getParentIndex(_hipsIndex);
+        } else {
+            _hipsParentIndex = -1;
+        }
     } else {
         clearConstraints();
         _headIndex = -1;