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

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

Browse source
This commit is contained in:
Andrzej Kapolka 2014-06-04 11:51:11 -07:00
commit f6395435cf
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1344,7 +1344,7 @@ bool Model::restoreJointPosition(int jointIndex, float fraction, float priority)
} }
const FBXGeometry& geometry = _geometry->getFBXGeometry(); const FBXGeometry& geometry = _geometry->getFBXGeometry();
const QVector<int>& freeLineage = geometry.joints.at(jointIndex).freeLineage; const QVector<int>& freeLineage = geometry.joints.at(jointIndex).freeLineage;
foreach (int index, freeLineage) { foreach (int index, freeLineage) {
JointState& state = _jointStates[index]; JointState& state = _jointStates[index];
state.restoreRotation(fraction, priority); state.restoreRotation(fraction, priority);
@ -2017,7 +2017,7 @@ glm::quat JointState::getJointRotation(bool fromBind) const {
void JointState::restoreRotation(float fraction, float priority) { void JointState::restoreRotation(float fraction, float priority) {
assert(_fbxJoint != NULL); assert(_fbxJoint != NULL);
if (priority == _animationPriority) { if (priority == _animationPriority || _animationPriority == 0.0f) {
_rotation = safeMix(_rotation, _fbxJoint->rotation, fraction); _rotation = safeMix(_rotation, _fbxJoint->rotation, fraction);
_animationPriority = 0.0f; _animationPriority = 0.0f;
} }