bringing back a bug fix from samuel

This commit is contained in:
sam gateau 2018-09-26 14:15:42 -07:00
parent b5a47b2e76
commit 1e112d3c84

View file

@ -1533,11 +1533,11 @@ void Model::setBlendedVertices(int blendNumber, const QVector<BlendshapeOffset>&
for (int i = 0; i < fbxGeometry.meshes.size(); i++) { for (int i = 0; i < fbxGeometry.meshes.size(); i++) {
const FBXMesh& mesh = fbxGeometry.meshes.at(i); const FBXMesh& mesh = fbxGeometry.meshes.at(i);
auto meshBlendshapeOffsets = _blendshapeOffsets.find(i); auto meshBlendshapeOffsets = _blendshapeOffsets.find(i);
if (mesh.blendshapes.isEmpty() || meshBlendshapeOffsets == _blendshapeOffsets.end() || meshBlendshapeOffsets == _blendshapeOffsets.end()) { const auto& buffer = _blendshapeBuffers.find(i);
if (mesh.blendshapes.isEmpty() || meshBlendshapeOffsets == _blendshapeOffsets.end() || buffer == _blendshapeBuffers.end()) {
continue; continue;
} }
const auto& buffer = _blendshapeBuffers.find(i);
const auto blendshapeOffsetSize = meshBlendshapeOffsets->second.size() * sizeof(BlendshapeOffset); const auto blendshapeOffsetSize = meshBlendshapeOffsets->second.size() * sizeof(BlendshapeOffset);
buffer->second->setData(blendshapeOffsetSize, (gpu::Byte*) blendshapeOffsets.constData() + index * sizeof(BlendshapeOffset)); buffer->second->setData(blendshapeOffsetSize, (gpu::Byte*) blendshapeOffsets.constData() + index * sizeof(BlendshapeOffset));