Merge pull request #8768 from ZappoMan/nestedSkyboxes

fix skybox changing when going between zones
This commit is contained in:
Brad Hefta-Gaub 2016-10-10 15:13:33 -07:00 committed by GitHub
commit 798a5cfc9d

View file

@ -478,7 +478,8 @@ bool EntityTreeRenderer::applySkyboxAndHasAmbient() {
}
}
if (_pendingSkyboxTexture && !_skyboxTexture) {
if (_pendingSkyboxTexture &&
(!_skyboxTexture || (_skyboxTexture->getURL() != _skyboxTextureURL))) {
_skyboxTexture = textureCache->getTexture(_skyboxTextureURL, NetworkTexture::CUBE_TEXTURE);
}
if (_skyboxTexture && _skyboxTexture->isLoaded()) {