Merge branch 'fix-tablet-qml-overlay-in-hmd' of github.com:sethalves/hifi into tablet-ui-edit-js

This commit is contained in:
Seth Alves 2017-03-07 12:10:20 -08:00
commit aa4cbe2892

View file

@ -165,6 +165,9 @@ void initDeferredPipelines(render::ShapePlumber& plumber) {
addPipeline(
Key::Builder().withMaterial(),
modelVertex, modelPixel);
addPipeline(
Key::Builder(),
modelVertex, modelPixel);
addPipeline(
Key::Builder().withMaterial().withUnlit(),
modelVertex, modelUnlitPixel);