Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-25 20:15:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #12136 from SamGondelman/texture

Browse source 
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
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/entities-renderer/src/RenderableModelEntityItem.cpp
View file

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