From b5731135ddeb2c4feae495d00f4f4aff399f8f3c Mon Sep 17 00:00:00 2001
From: ZappoMan <bradh@konamoxt.com>
Date: Wed, 17 Jun 2015 09:08:41 -0700
Subject: [PATCH] cleanup

---
 interface/src/Application.cpp |  8 +++++---
 interface/src/Environment.cpp | 10 +++-------
 interface/src/Environment.h   |  2 +-
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index efe7df4240..1ead8fe4f8 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -3330,11 +3330,13 @@ namespace render {
                     PerformanceTimer perfTimer("atmosphere");
                     PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings),
                         "Application::displaySide() ... atmosphere...");
-                    gpu::Batch batch;
-                    //DependencyManager::get<DeferredLightingEffect>()->renderSolidSphere(batch,0.5f, 100, 50, glm::vec4(1.0f, 0.0f, 0.0f, 1.0f)); //Draw a unit sphere
+
                     background->_environment->renderAtmospheres(batch, *(args->_viewFrustum));
+                    
+                    // FIX ME - If I don't call this renderBatch() here, then the atmosphere doesn't render, but it
+                    // seems like these payloadRender() methods shouldn't be doing this. We need to investigate why
+                    // the engine isn't rendering our batch
                     gpu::GLBackend::renderBatch(batch, true);
-                    glUseProgram(0);
 
                 }
 
diff --git a/interface/src/Environment.cpp b/interface/src/Environment.cpp
index b333d648ef..09dd8f792e 100644
--- a/interface/src/Environment.cpp
+++ b/interface/src/Environment.cpp
@@ -15,18 +15,15 @@
 #include <QMutexLocker>
 #include <QtDebug>
 
-#include <DeferredLightingEffect.h>
+#include <GeometryCache.h>
 #include <GeometryUtil.h>
+#include <NumericalConstants.h>
+#include <OctreePacketData.h>
 #include <PacketHeaders.h>
 #include <PathUtils.h>
 #include <ProgramObject.h>
 #include <SharedUtil.h>
 
-#include "Application.h"
-#include "Camera.h"
-#include "world.h"
-#include "InterfaceLogging.h"
-
 #include "Environment.h"
 
 #include "../../build/libraries/model/SkyFromSpace_vert.h"
@@ -52,7 +49,6 @@ Environment::~Environment() {
 
 void Environment::init() {
     if (_initialized) {
-        qCDebug(interfaceapp, "[ERROR] Environment is already initialized.");
         return;
     }
 
diff --git a/interface/src/Environment.h b/interface/src/Environment.h
index 547f46c9fe..fe0c564493 100644
--- a/interface/src/Environment.h
+++ b/interface/src/Environment.h
@@ -18,7 +18,7 @@
 #include <HifiSockAddr.h>
 #include <gpu/Batch.h>
 
-#include <ProgramObject.h>
+//#include <ProgramObject.h>
 
 #include "EnvironmentData.h"