Merge branch 'ragdoll' of ssh://github.com/AndrewMeadows/hifi into ragdoll

This commit is contained in:
Andrew Meadows 2014-08-18 12:55:10 -07:00
commit c2f4648ad7

View file

@ -31,10 +31,8 @@ SkeletonModel::SkeletonModel(Avatar* owningAvatar, QObject* parent) :
}
SkeletonModel::~SkeletonModel() {
if (_ragdoll) {
delete _ragdoll;
_ragdoll = NULL;
}
delete _ragdoll;
_ragdoll = NULL;
}
void SkeletonModel::setJointStates(QVector<JointState> states) {