History

cleanup

SamGondelman committed 8 years ago

Commit 2ba3e331 parent bd06dc64 files · +24 −22Browse files

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

Unified · Split

libraries/render-utils/src/Model.cpp+3−3
@@ -278,9 +278,9 @@ void Model::updateRenderItems() { · 277 unmodified lines
278 }278 }
279 data.updateTransformForSkinnedMesh(renderTransform, modelTransform);279 data.updateTransformForSkinnedMesh(renderTransform, modelTransform);
280 280
281 data.setKey(data.evalKey(isVisible, isLayeredInFront, isLayeredInHUD));281 data.setKey(isVisible, isLayeredInFront || isLayeredInHUD);
282 data.setLayer(data.evalLayer(isLayeredInFront, isLayeredInHUD));282 data.setLayer(isLayeredInFront, isLayeredInHUD);
283 data.setShapeKey(invalidatePayloadShapeKey ? render::ShapeKey::Builder::invalid() : data.evalShapeKey(isWireframe));283 data.setShapeKey(invalidatePayloadShapeKey, isWireframe);
284 });284 });
285 }285 }
286 286

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