From f33728b6152076f8ac90cc338672ceb639464fa5 Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Mon, 30 Jun 2014 09:13:42 -0700 Subject: [PATCH 1/3] guarantee that ragdoll is clear before initialized --- interface/src/avatar/SkeletonModel.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/interface/src/avatar/SkeletonModel.cpp b/interface/src/avatar/SkeletonModel.cpp index e9328d32ca..763aa27f00 100644 --- a/interface/src/avatar/SkeletonModel.cpp +++ b/interface/src/avatar/SkeletonModel.cpp @@ -505,8 +505,7 @@ void SkeletonModel::renderRagdoll() { // virtual void SkeletonModel::initRagdollPoints() { - assert(_ragdollPoints.size() == 0); - assert(_ragdollConstraints.size() == 0); + clearRagdollConstraintsAndPoints(); // one point for each joint int numJoints = _jointStates.size(); From 57c17eb972f92eaf3ff110426c7f7d6a5230b15c Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Mon, 30 Jun 2014 09:18:31 -0700 Subject: [PATCH 2/3] remove unecessary clearRagdollConstraintsAndPoints() --- interface/src/avatar/SkeletonModel.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/interface/src/avatar/SkeletonModel.cpp b/interface/src/avatar/SkeletonModel.cpp index 763aa27f00..3b09a1a2ba 100644 --- a/interface/src/avatar/SkeletonModel.cpp +++ b/interface/src/avatar/SkeletonModel.cpp @@ -39,7 +39,6 @@ void SkeletonModel::setJointStates(QVector states) { } clearShapes(); - clearRagdollConstraintsAndPoints(); if (_enableShapes) { buildShapes(); } From 146cd2b59d7cee3e7c25cf5388ef0afe8622b0e3 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Mon, 30 Jun 2014 12:23:33 -0700 Subject: [PATCH 3/3] update BUILD.md to remove zlib requirement --- BUILD.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BUILD.md b/BUILD.md index b8bc1cd14c..674f0d24cc 100644 --- a/BUILD.md +++ b/BUILD.md @@ -63,7 +63,7 @@ If `libgnutls28-dev` 3.2.12 or higher is available via your package manager, it [Homebrew](http://brew.sh/) is an excellent package manager for OS X. It makes install of all hifi dependencies very simple. brew tap highfidelity/homebrew-formulas - brew install cmake glm zlib gnutls + brew install cmake glm gnutls brew install highfidelity/formulas/qt5 brew link qt5 --force brew install highfidelity/formulas/qxmpp