Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 01:36:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #12331 from ctrlaltdavid/21732

Browse source 
Fix scaling of avatar submeshes attached to joints
This commit is contained in:
Anthony Thibault 2018-02-05 10:19:18 -08:00 committed by GitHub
commit 819af96fcc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libraries/animation/src/Rig.cpp
View file

@ -1754,7 +1754,6 @@ void Rig::copyJointsFromJointData(const QVector<JointData>& jointDataVec) {
const AnimPoseVec& relativeDefaultPoses = _animSkeleton->getRelativeDefaultPoses(); const AnimPoseVec& relativeDefaultPoses = _animSkeleton->getRelativeDefaultPoses();
for (int i = 0; i < numJoints; i++) { for (int i = 0; i < numJoints; i++) {
const JointData& data = jointDataVec.at(i); const JointData& data = jointDataVec.at(i);
_internalPoseSet._relativePoses[i].scale() = Vectors::ONE;
_internalPoseSet._relativePoses[i].rot() = rotations[i]; _internalPoseSet._relativePoses[i].rot() = rotations[i];
if (data.translationIsDefaultPose) { if (data.translationIsDefaultPose) {
_internalPoseSet._relativePoses[i].trans() = relativeDefaultPoses[i].trans(); _internalPoseSet._relativePoses[i].trans() = relativeDefaultPoses[i].trans();