From acbdd2b3b57d37986a732929a411e44d5024501d Mon Sep 17 00:00:00 2001 From: sabrina-shanman Date: Wed, 16 Oct 2019 17:04:19 -0700 Subject: [PATCH] Fix not building due to removed shape.transform --- libraries/fbx/src/GLTFSerializer.cpp | 2 +- libraries/hfm/src/hfm/HFMModelMath.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/fbx/src/GLTFSerializer.cpp b/libraries/fbx/src/GLTFSerializer.cpp index 9fb00d3145..db272a534c 100755 --- a/libraries/fbx/src/GLTFSerializer.cpp +++ b/libraries/fbx/src/GLTFSerializer.cpp @@ -1524,7 +1524,7 @@ bool GLTFSerializer::buildGeometry(HFMModel& hfmModel, const hifi::VariantHash& hfmModel.shapes.push_back(templateShape); auto& hfmShape = hfmModel.shapes.back(); // Everything else is already defined (mesh, meshPart, material), so just define the new transform - hfmShape.transform = nodeIndex; + hfmShape.joint = nodeIndex; } } diff --git a/libraries/hfm/src/hfm/HFMModelMath.cpp b/libraries/hfm/src/hfm/HFMModelMath.cpp index e6ba042e9c..de308297c4 100644 --- a/libraries/hfm/src/hfm/HFMModelMath.cpp +++ b/libraries/hfm/src/hfm/HFMModelMath.cpp @@ -40,7 +40,7 @@ void calculateExtentsForShape(hfm::Shape& shape, const std::vector& m const auto& mesh = meshes[shape.mesh]; const auto& meshPart = mesh.parts[shape.meshPart]; - glm::mat4 globalTransform = joints[shape.transform].globalTransform; + glm::mat4 globalTransform = joints[shape.joint].globalTransform; forEachIndex(meshPart, [&](int32_t idx){ if (mesh.vertices.size() <= idx) { return;