Merge pull request #7349 from zzmp/fix/guard-skybox-tex

Guard against failure to load skybox tex
This commit is contained in:
Chris Collins 2016-03-16 15:06:52 -07:00
commit 307a0cf05a

View file

@ -379,15 +379,19 @@ void EntityTreeRenderer::applyZonePropertiesToScene(std::shared_ptr<ZoneEntityIt
_pendingSkyboxTexture = false; _pendingSkyboxTexture = false;
auto texture = _skyboxTexture->getGPUTexture(); auto texture = _skyboxTexture->getGPUTexture();
skybox->setCubemap(texture); if (texture) {
if (!isAmbientTextureSet) { skybox->setCubemap(texture);
sceneKeyLight->setAmbientSphere(texture->getIrradiance()); if (!isAmbientTextureSet) {
sceneKeyLight->setAmbientMap(texture); sceneKeyLight->setAmbientSphere(texture->getIrradiance());
isAmbientTextureSet = true; sceneKeyLight->setAmbientMap(texture);
isAmbientTextureSet = true;
}
} else {
qCDebug(entitiesrenderer) << "Failed to load skybox texture:" << zone->getSkyboxProperties().getURL();
skybox->setCubemap(nullptr);
} }
} else { } else {
skybox->setCubemap(nullptr); skybox->setCubemap(nullptr);
qCDebug(entitiesrenderer) << "Failed to load skybox:" << zone->getSkyboxProperties().getURL();
} }
} }
skyStage->setBackgroundMode(model::SunSkyStage::SKY_BOX); skyStage->setBackgroundMode(model::SunSkyStage::SKY_BOX);