From 706f85e4ce81985752d71950dadb9f2daa959d06 Mon Sep 17 00:00:00 2001
From: Niraj Venkat <venkatn93@gmail.com>
Date: Thu, 9 Jul 2015 17:31:38 -0700
Subject: [PATCH] Fixes to comply with coding standard

---
 interface/src/Application.cpp                          | 1 -
 libraries/entities-renderer/src/EntityTreeRenderer.cpp | 4 ++--
 libraries/entities-renderer/src/EntityTreeRenderer.h   | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 9482ed8586..91baa8c8b5 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -3458,7 +3458,6 @@ void Application::displaySide(RenderArgs* renderArgs, Camera& theCamera, bool se
    // Assuming nothing get's rendered through that
 
     if (!selfAvatarOnly) {
-        auto var = DependencyManager::get<SceneScriptingInterface>()->shouldRenderEntities();
         // render models...
         PerformanceTimer perfTimer("entities");
         PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings),
diff --git a/libraries/entities-renderer/src/EntityTreeRenderer.cpp b/libraries/entities-renderer/src/EntityTreeRenderer.cpp
index a2f6bc3289..11d24c6d9d 100644
--- a/libraries/entities-renderer/src/EntityTreeRenderer.cpp
+++ b/libraries/entities-renderer/src/EntityTreeRenderer.cpp
@@ -803,7 +803,7 @@ void EntityTreeRenderer::connectSignalsToSlots(EntityScriptingInterface* entityS
     connect(this, &EntityTreeRenderer::leaveEntity, entityScriptingInterface, &EntityScriptingInterface::leaveEntity);
     connect(this, &EntityTreeRenderer::collisionWithEntity, entityScriptingInterface, &EntityScriptingInterface::collisionWithEntity);
 
-    connect(&(*DependencyManager::get<SceneScriptingInterface>()), &SceneScriptingInterface::shouldRenderEntitiesChanged, this, &EntityTreeRenderer::updateEntityTree, Qt::QueuedConnection);
+    connect(&(*DependencyManager::get<SceneScriptingInterface>()), &SceneScriptingInterface::shouldRenderEntitiesChanged, this, &EntityTreeRenderer::updateEntityRenderStatus, Qt::QueuedConnection);
 }
 
 QScriptValueList EntityTreeRenderer::createMouseEventArgs(const EntityItemID& entityID, QMouseEvent* event, unsigned int deviceID) {
@@ -1155,7 +1155,7 @@ void EntityTreeRenderer::entityCollisionWithEntity(const EntityItemID& idA, cons
     }
 }
 
-void EntityTreeRenderer::updateEntityTree(bool shouldRenderEntities) {
+void EntityTreeRenderer::updateEntityRenderStatus(bool shouldRenderEntities) {
     if (DependencyManager::get<SceneScriptingInterface>()->shouldRenderEntities()) {
         for (auto entityID : _entityIDsLastInScene) {
             addingEntity(entityID);
diff --git a/libraries/entities-renderer/src/EntityTreeRenderer.h b/libraries/entities-renderer/src/EntityTreeRenderer.h
index aae9c63d9a..28a6a3172c 100644
--- a/libraries/entities-renderer/src/EntityTreeRenderer.h
+++ b/libraries/entities-renderer/src/EntityTreeRenderer.h
@@ -115,7 +115,7 @@ public slots:
     void deletingEntity(const EntityItemID& entityID);
     void entitySciptChanging(const EntityItemID& entityID, const bool reload);
     void entityCollisionWithEntity(const EntityItemID& idA, const EntityItemID& idB, const Collision& collision);
-    void updateEntityTree(bool shouldRenderEntities);
+    void updateEntityRenderStatus(bool shouldRenderEntities);
 
     // optional slots that can be wired to menu items
     void setDisplayElementChildProxies(bool value) { _displayElementChildProxies = value; }