mirror of
https://github.com/overte-org/overte.git
synced 2025-08-09 12:49:34 +02:00
Fix merge errors
This commit is contained in:
parent
6a06bf405a
commit
795a3b8407
1 changed files with 2 additions and 2 deletions
|
@ -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();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue