From a424ff98ca06157d94ffa04c9be9221bf1f54d08 Mon Sep 17 00:00:00 2001
From: Sam Gateau <sam@highfidelity.io>
Date: Thu, 23 Jul 2015 16:55:18 -0700
Subject: [PATCH] Fixing issues with the review process

---
 interface/src/Application.cpp             | 7 ++-----
 interface/src/avatar/MyAvatar.cpp         | 2 ++
 libraries/gpu/src/gpu/Context.h           | 2 ++
 libraries/gpu/src/gpu/GLBackendOutput.cpp | 3 ++-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index f073e5cb26..efe208a1b8 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -962,10 +962,6 @@ void Application::paintGL() {
         _myCamera.update(1.0f / _fps);
     }
 
-    // Sync up the View Furstum with the camera
- //   loadViewFrustum(_myCamera, _viewFrustum);
-
-
     renderArgs._renderMode = RenderArgs::DEFAULT_RENDER_MODE;
 
     if (OculusManager::isConnected()) {
@@ -3010,7 +3006,8 @@ QImage Application::renderAvatarBillboard(RenderArgs* renderArgs) {
         batch.setFramebuffer(primaryFbo);
         renderArgs->_context->render(batch);
     }
-    renderArgs->_renderMode = RenderArgs::NORMAL_RENDER_MODE;
+    renderArgs->_renderMode = RenderArgs::DEFAULT_RENDER_MODE;
+
     renderRearViewMirror(renderArgs, QRect(0, 0, BILLBOARD_SIZE, BILLBOARD_SIZE), true);
 
     {
diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index 9752536f60..c6c6919325 100644
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -1551,7 +1551,9 @@ void MyAvatar::maybeUpdateBillboard() {
     QBuffer buffer(&_billboard);
     buffer.open(QIODevice::WriteOnly);
     image.save(&buffer, "PNG");
+#ifdef DEBUG
     image.save("billboard.png", "PNG");
+#endif
     _billboardValid = true;
 
     sendBillboardPacket();
diff --git a/libraries/gpu/src/gpu/Context.h b/libraries/gpu/src/gpu/Context.h
index 0c4ead6eae..ab7a1d1c11 100644
--- a/libraries/gpu/src/gpu/Context.h
+++ b/libraries/gpu/src/gpu/Context.h
@@ -20,6 +20,8 @@
 #include "Pipeline.h"
 #include "Framebuffer.h"
 
+class QImage;
+
 namespace gpu {
 
 class Backend {
diff --git a/libraries/gpu/src/gpu/GLBackendOutput.cpp b/libraries/gpu/src/gpu/GLBackendOutput.cpp
index 44dee90fa7..7245272131 100755
--- a/libraries/gpu/src/gpu/GLBackendOutput.cpp
+++ b/libraries/gpu/src/gpu/GLBackendOutput.cpp
@@ -8,10 +8,11 @@
 //  Distributed under the Apache License, Version 2.0.
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
+#include <qimage.h>
+
 #include "GPULogging.h"
 #include "GLBackendShared.h"
 
-#include "qimage.h"
 
 using namespace gpu;