History

Merge branch 'master' of https://github.com/highfidelity/hifi into fix-attachments

ZappoMan committed 11 years ago

Commit aa05d9f2 parents dbae2c3 ef58aa515 files · +414 −148Browse files

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

Unified · Split

libraries/render-utils/src/Model.cpp+3−0
@@ -875,6 +875,9 @@ namespace render { · 874 unmodified lines
875 return payload->model->renderPart(args, payload->meshIndex, payload->partIndex, false);875 return payload->model->renderPart(args, payload->meshIndex, payload->partIndex, false);
876 }876 }
877 }877 }
878 /* template <> const model::MaterialKey& shapeGetMaterialKey(const OpaqueMeshPart::Pointer& payload) {
879 return payload->model->getPartMaterial(payload->meshIndex, payload->partIndex);
880 }*/
878}881}
879 882
880void Model::setVisibleInScene(bool newValue, std::shared_ptr<render::Scene> scene) {883void Model::setVisibleInScene(bool newValue, std::shared_ptr<render::Scene> scene) {

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