History

Merge branch 'master' of https://github.com/highfidelity/hifi into meta

samcake committed 9 years ago

Commit 0b9b5d52 parents 83d1c3a 1df13d65 files · +35 −18Browse files

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

Unified · Split

libraries/render-utils/src/Model.cpp+1−1
@@ -238,7 +238,7 @@ void Model::updateRenderItems() { · 237 unmodified lines
238 238
239 // update the model transform and bounding box for this render item.239 // update the model transform and bounding box for this render item.
240 const Model::MeshState& state = data._model->_meshStates.at(data._meshIndex);240 const Model::MeshState& state = data._model->_meshStates.at(data._meshIndex);
241 data.updateTransformForSkinnedMesh(modelTransform, state.clusterMatrices);241 data.updateTransformForSkinnedMesh(modelTransform, state.clusterMatrices, state.cauterizedClusterMatrices);
242 }242 }
243 }243 }
244 });244 });

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t