History

Merge branch 'master' of https://github.com/highfidelity/hifi into hdr

samcake committed 10 years ago

Commit 483d20d2 parents 9f87089 c81279834 files · +342 −171Browse files

Showing the changes to libraries/render-utils/src/RenderDeferredTask.cpp (1 of 34 files). Show all

Unified · Split

libraries/render-utils/src/RenderDeferredTask.cpp+3−0
@@ -191,6 +191,9 @@ void RenderDeferredTask::run(const SceneContextPointer& sceneContext, const Rend · 190 unmodified lines
191 setToneMappingToneCurve(renderContext->getTone().toneCurve);191 setToneMappingToneCurve(renderContext->getTone().toneCurve);
192 // TODO: Allow runtime manipulation of culling ShouldRenderFunctor192 // TODO: Allow runtime manipulation of culling ShouldRenderFunctor
193 193
194 // TODO: For now, lighting is controlled through a singleton, so it is distinct
195 DependencyManager::get<DeferredLightingEffect>()->setShadowMapStatus(renderContext->getShadowMapStatus());
196
194 renderContext->getArgs()->_context->syncCache();197 renderContext->getArgs()->_context->syncCache();
195 198
196 for (auto job : _jobs) {199 for (auto job : _jobs) {