Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-22 21:06:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels

Browse source
This commit is contained in:
Andrzej Kapolka 2014-06-30 12:42:02 -07:00
commit 110f90df0e
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
BUILD.md
View file

@ -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. [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 tap highfidelity/homebrew-formulas
brew install cmake glm zlib gnutls brew install cmake glm gnutls
brew install highfidelity/formulas/qt5 brew install highfidelity/formulas/qt5
brew link qt5 --force brew link qt5 --force
brew install highfidelity/formulas/qxmpp brew install highfidelity/formulas/qxmpp

4
interface/src/avatar/SkeletonModel.cpp
View file

@ -39,7 +39,6 @@ void SkeletonModel::setJointStates(QVector<JointState> states) {
} }
clearShapes(); clearShapes();
clearRagdollConstraintsAndPoints();
if (_enableShapes) { if (_enableShapes) {
buildShapes(); buildShapes();
} }
@ -505,8 +504,7 @@ void SkeletonModel::renderRagdoll() {
// virtual // virtual
void SkeletonModel::initRagdollPoints() { void SkeletonModel::initRagdollPoints() {
assert(_ragdollPoints.size() == 0); clearRagdollConstraintsAndPoints();
assert(_ragdollConstraints.size() == 0);
// one point for each joint // one point for each joint
int numJoints = _jointStates.size(); int numJoints = _jointStates.size();