From 0d1bd6afbfb834c64624e19555ed1a22b3e4c71c Mon Sep 17 00:00:00 2001 From: sabrina-shanman Date: Wed, 30 Oct 2019 13:32:30 -0700 Subject: [PATCH] Fix wrong transformForCluster for non-root joints with Z up axis --- libraries/fbx/src/FBXSerializer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/fbx/src/FBXSerializer.cpp b/libraries/fbx/src/FBXSerializer.cpp index e6bc35da9b..33b9457928 100644 --- a/libraries/fbx/src/FBXSerializer.cpp +++ b/libraries/fbx/src/FBXSerializer.cpp @@ -1375,7 +1375,7 @@ HFMModel* FBXSerializer::extractHFMModel(const hifi::VariantHash& mapping, const // If needed, separately calculate the FBX-specific transform used for inverse bind transform calculations glm::mat4 transformForCluster; - if (applyUpAxisZRotation && joint.parentIndex == -1) { + if (applyUpAxisZRotation) { const glm::quat jointBindCombinedRotation = fbxModel.preRotation * fbxModel.rotation * fbxModel.postRotation; const glm::mat4 localTransformForCluster = glm::translate(fbxModel.translation) * fbxModel.preTransform * glm::mat4_cast(jointBindCombinedRotation) * fbxModel.postTransform; if (fbxModel.parentIndex != -1 && fbxModel.parentIndex < (int)jointIndex && !needMixamoHack) {