From 575d4abdf710a7381cfe846d1dee7fed3252449f Mon Sep 17 00:00:00 2001 From: samcake Date: Wed, 24 May 2017 17:25:21 -0700 Subject: [PATCH] bad include fixed maybe --- interface/src/Application.cpp | 8 +------- .../entities-renderer/src/RenderableZoneEntityItem.cpp | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 1d74fd31fd..6b41d921de 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -337,7 +337,7 @@ public: // Don't actually crash in debug builds, in case this apparent deadlock is simply from // the developer actively debugging code #ifdef NDEBUG - // deadlockDetectionCrash(); + deadlockDetectionCrash(); #endif } } @@ -5097,12 +5097,6 @@ void Application::displaySide(RenderArgs* renderArgs, Camera& theCamera, bool se }); } - // Setup the current Zone Entity lighting - { - // auto stage = DependencyManager::get()->getSkyStage(); - // DependencyManager::get()->setGlobalLight(stage->getSunLight()); - } - { PerformanceTimer perfTimer("SceneProcessTransaction"); _main3DScene->enqueueTransaction(transaction); diff --git a/libraries/entities-renderer/src/RenderableZoneEntityItem.cpp b/libraries/entities-renderer/src/RenderableZoneEntityItem.cpp index d5579aa022..7825a50f25 100644 --- a/libraries/entities-renderer/src/RenderableZoneEntityItem.cpp +++ b/libraries/entities-renderer/src/RenderableZoneEntityItem.cpp @@ -19,6 +19,7 @@ #include #include #include +#include #include "EntityTreeRenderer.h" #include "RenderableEntityItem.h" @@ -26,7 +27,6 @@ #include #include "DeferredLightingEffect.h" -#include class RenderableZoneEntityItemMeta { public: