Merge pull request #12136 from SamGondelman/texture

Keep requesting render update until textures load
This commit is contained in:
Sam Gateau 2018-01-11 14:09:21 -08:00 committed by GitHub
commit 4663f8eb2a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1095,7 +1095,7 @@ bool ModelEntityRenderer::needsRenderUpdate() const {
return true;
}
if (!_texturesLoaded && model->getGeometry() && model->getGeometry()->areTexturesLoaded()) {
if (!_texturesLoaded) {
return true;
}
@ -1328,6 +1328,8 @@ void ModelEntityRenderer::doRenderUpdateSynchronousTyped(const ScenePointer& sce
if (!_texturesLoaded && model->getGeometry() && model->getGeometry()->areTexturesLoaded()) {
_texturesLoaded = true;
model->updateRenderItems();
} else if (!_texturesLoaded) {
emit requestRenderUpdate();
}
// When the individual mesh parts of a model finish fading, they will mark their Model as needing updating