History

Exposing the drawcall user info just a uint16 right now and use it for the skinning and blendshape

sam gateau committed 8 years ago

Commit 7cf7eaa2 parents 4210ce4 a602bff36 files · +448 −66Browse files

Showing the changes to libraries/render-utils/src/Model.cpp (1 of 36 files). Show all

Unified · Split

libraries/render-utils/src/Model.cpp+1−2
@@ -1533,12 +1533,11 @@ void Model::setBlendedVertices(int blendNumber, const QVector<BlendshapeOffset>& · 1532 unmodified lines
15331533 for (int i = 0; i < fbxGeometry.meshes.size(); i++) {
15341534 const FBXMesh& mesh = fbxGeometry.meshes.at(i);
15351535 auto meshBlendshapeOffsets = _blendshapeOffsets.find(i);
1536− if (mesh.blendshapes.isEmpty() || meshBlendshapeOffsets == _blendshapeOffsets.end()) {
1536+ if (mesh.blendshapes.isEmpty() || meshBlendshapeOffsets == _blendshapeOffsets.end() || meshBlendshapeOffsets == _blendshapeOffsets.end()) {
15371537 continue;
15381538 }
15391539
15401540 const auto& buffer = _blendshapeBuffers.find(i);
1541− assert(buffer != _blendshapeBuffers.end());
15421541 const auto blendshapeOffsetSize = meshBlendshapeOffsets->second.size() * sizeof(BlendshapeOffset);
15431542 buffer->second->setData(blendshapeOffsetSize, (gpu::Byte*) blendshapeOffsets.constData() + index * sizeof(BlendshapeOffset));
15441543