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

Fix merge errors

Browse source
This commit is contained in:
Brad Davis 2018-01-16 19:27:35 -08:00
parent 6a06bf405a
commit 795a3b8407
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/render-utils/src/RenderForwardTask.cpp
View file

@ -169,13 +169,13 @@ void PrepareForward::run(const RenderContextPointer& renderContext, const Inputs
gpu::doInBatch(args->_context, [&](gpu::Batch& batch) { gpu::doInBatch(args->_context, [&](gpu::Batch& batch) {
args->_batch = &batch; args->_batch = &batch;
model::LightPointer keySunLight; graphics::LightPointer keySunLight;
auto lightStage = args->_scene->getStage<LightStage>(); auto lightStage = args->_scene->getStage<LightStage>();
if (lightStage) { if (lightStage) {
keySunLight = lightStage->getCurrentKeyLight(); keySunLight = lightStage->getCurrentKeyLight();
} }
model::LightPointer keyAmbiLight; graphics::LightPointer keyAmbiLight;
if (lightStage) { if (lightStage) {
keyAmbiLight = lightStage->getCurrentAmbientLight(); keyAmbiLight = lightStage->getCurrentAmbientLight();
} }