Merge branch 'graphics' of https://github.com/highfidelity/hifi into hdr

This commit is contained in:
samcake 2015-12-18 13:20:46 -08:00
commit 0482a2a7f7

View file

@ -470,6 +470,9 @@ void ModelMeshPartPayload::render(RenderArgs* args) const {
ModelRender::pickPrograms(batch, mode, translucentMesh, alphaThreshold, hasLightmap, hasTangents, hasSpecular, isSkinned, wireframe,
args, locations);
if (!locations) { // the pipeline could not be found
return;
}
// Bind the model transform and the skinCLusterMatrices if needed
bindTransform(batch, locations);