From 8b7ad9cfcbaa68ab360c0a7561e5af5da8ee3c6e Mon Sep 17 00:00:00 2001
From: Sam Gateau <sam@highfidelity.io>
Date: Wed, 29 Jul 2015 17:13:48 -0700
Subject: [PATCH] merge with upstream

---
 interface/src/Application.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 5845267f72..1dc2878008 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -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() {