Post merge with Zach work for environment map

This commit is contained in:
samcake 2016-02-26 16:32:29 -08:00
parent 99ba011996
commit cfcde5032c

View file

@ -323,7 +323,7 @@ void DeferredLightingEffect::render(const render::RenderContextPointer& renderCo
/* if (_skyboxTexture) { /* if (_skyboxTexture) {
program = _directionalSkyboxLightShadow; program = _directionalSkyboxLightShadow;
locations = _directionalSkyboxLightShadowLocations; locations = _directionalSkyboxLightShadowLocations;
} else {*/ } else*/ {
program = _directionalAmbientSphereLightShadow; program = _directionalAmbientSphereLightShadow;
locations = _directionalAmbientSphereLightShadowLocations; locations = _directionalAmbientSphereLightShadowLocations;
} }
@ -331,7 +331,7 @@ void DeferredLightingEffect::render(const render::RenderContextPointer& renderCo
/* if (_skyboxTexture) { /* if (_skyboxTexture) {
program = _directionalSkyboxLight; program = _directionalSkyboxLight;
locations = _directionalSkyboxLightLocations; locations = _directionalSkyboxLightLocations;
} else {*/ } else*/ {
program = _directionalAmbientSphereLight; program = _directionalAmbientSphereLight;
locations = _directionalAmbientSphereLightLocations; locations = _directionalAmbientSphereLightLocations;
} }