Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 05:58:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

bad include fixed maybe

Browse source
This commit is contained in:
samcake 2017-05-24 17:25:21 -07:00
parent 044110e4f3
commit 575d4abdf7
2 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
interface/src/Application.cpp
View file

@ -337,7 +337,7 @@ public:
// Don't actually crash in debug builds, in case this apparent deadlock is simply from // Don't actually crash in debug builds, in case this apparent deadlock is simply from
// the developer actively debugging code // the developer actively debugging code
#ifdef NDEBUG #ifdef NDEBUG
// deadlockDetectionCrash(); deadlockDetectionCrash();
#endif #endif
} }
} }
@ -5097,12 +5097,6 @@ void Application::displaySide(RenderArgs* renderArgs, Camera& theCamera, bool se
}); });
} }
// Setup the current Zone Entity lighting
{
// auto stage = DependencyManager::get<SceneScriptingInterface>()->getSkyStage();
// DependencyManager::get<DeferredLightingEffect>()->setGlobalLight(stage->getSunLight());
}
{ {
PerformanceTimer perfTimer("SceneProcessTransaction"); PerformanceTimer perfTimer("SceneProcessTransaction");
_main3DScene->enqueueTransaction(transaction); _main3DScene->enqueueTransaction(transaction);

2
libraries/entities-renderer/src/RenderableZoneEntityItem.cpp
View file

@ -19,6 +19,7 @@
#include <DependencyManager.h> #include <DependencyManager.h>
#include <GeometryCache.h> #include <GeometryCache.h>
#include <PerfStat.h> #include <PerfStat.h>
#include <procedural/ProceduralSkybox.h>
#include "EntityTreeRenderer.h" #include "EntityTreeRenderer.h"
#include "RenderableEntityItem.h" #include "RenderableEntityItem.h"
@ -26,7 +27,6 @@
#include <LightPayload.h> #include <LightPayload.h>
#include "DeferredLightingEffect.h" #include "DeferredLightingEffect.h"
#include <procedural\ProceduralSkybox.h>
class RenderableZoneEntityItemMeta { class RenderableZoneEntityItemMeta {
public: public: