merge with upstream

This commit is contained in:
Sam Gateau 2015-07-29 17:13:48 -07:00
parent ab4b940d83
commit 8b7ad9cfcb

View file

@ -1019,7 +1019,9 @@ void Application::paintGL() {
// Back to the default framebuffer;
gpu::Batch batch;
batch.resetStages();
// renderArgs._context->render(batch);
// TODO: Testing the water here, it is maybe not needed at all,
// i would like to keep it like that until we merge with DisplayPlugin
// renderArgs._context->render(batch);
}
void Application::runTests() {