Showing the changes to libraries/render-utils/src/CauterizedModel.cpp (1 of 35 files). Show all
Unified · Split
| @@ -86,7 +86,7 @@ void CauterizedModel::createRenderItemSet() { · 85 unmodified lines | |||
| 86 | // Create the render payloads | 86 | // Create the render payloads |
| 87 | int numParts = (int)mesh->getNumParts(); | 87 | int numParts = (int)mesh->getNumParts(); |
| 88 | for (int partIndex = 0; partIndex < numParts; partIndex++) { | 88 | for (int partIndex = 0; partIndex < numParts; partIndex++) { |
| 89 | if (!fbxGeometry.meshes[i].blendshapes.empty() && _blendedVertexBuffers.find(i) == _blendedVertexBuffers.end()) { | 89 | if (_blendshapeBuffers.find(i) == _blendshapeBuffers.end()) { |
| 90 | initializeBlendshapes(fbxGeometry.meshes[i], i); | 90 | initializeBlendshapes(fbxGeometry.meshes[i], i); |
| 91 | } | 91 | } |
| 92 | auto ptr = std::make_shared<CauterizedMeshPartPayload>(shared_from_this(), i, partIndex, shapeID, transform, offset); | 92 | auto ptr = std::make_shared<CauterizedMeshPartPayload>(shared_from_this(), i, partIndex, shapeID, transform, offset); |
| @@ -97,7 +97,7 @@ void CauterizedModel::createRenderItemSet() { · 4 unmodified lines | |||
| 97 | shapeID++; | 97 | shapeID++; |
| 98 | } | 98 | } |
| 99 | } | 99 | } |
| 100 | _blendedVertexBuffersInitialized = true; | 100 | _blendshapeBuffersInitialized = true; |
| 101 | } else { | 101 | } else { |
| 102 | Model::createRenderItemSet(); | 102 | Model::createRenderItemSet(); |
| 103 | } | 103 | } |
| @@ -176,7 +176,7 @@ void CauterizedModel::updateClusterMatrices() { · 72 unmodified lines | |||
| 176 | 176 | ||
| 177 | // post the blender if we're not currently waiting for one to finish | 177 | // post the blender if we're not currently waiting for one to finish |
| 178 | auto modelBlender = DependencyManager::get<ModelBlender>(); | 178 | auto modelBlender = DependencyManager::get<ModelBlender>(); |
| 179 | if (_blendedVertexBuffersInitialized && modelBlender->shouldComputeBlendshapes() && geometry.hasBlendedMeshes() && _blendshapeCoefficients != _blendedBlendshapeCoefficients) { | 179 | if (_blendshapeBuffersInitialized && modelBlender->shouldComputeBlendshapes() && geometry.hasBlendedMeshes() && _blendshapeCoefficients != _blendedBlendshapeCoefficients) { |
| 180 | _blendedBlendshapeCoefficients = _blendshapeCoefficients; | 180 | _blendedBlendshapeCoefficients = _blendshapeCoefficients; |
| 181 | modelBlender->noteRequiresBlend(getThisPointer()); | 181 | modelBlender->noteRequiresBlend(getThisPointer()); |
| 182 | } | 182 | } |