Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 11:48:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #10290 from samcake/hotfix

Browse source 
Build 37.2 Hotfix to fix a crash with texture loading and Qt build 5.6.2
This commit is contained in:
Chris Collins 2017-04-26 14:28:24 -07:00 committed by GitHub
commit 3b839d3f9b
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libraries/model-networking/src/model-networking/TextureCache.cpp
View file

@ -559,9 +559,12 @@ void ImageReader::read() {
// Load the image into a gpu::Texture // Load the image into a gpu::Texture
auto networkTexture = resource.staticCast<NetworkTexture>(); auto networkTexture = resource.staticCast<NetworkTexture>();
texture.reset(networkTexture->getTextureLoader()(image, url)); texture.reset(networkTexture->getTextureLoader()(image, url));
texture->setSource(url);
if (texture) { if (texture) {
texture->setSource(url);
texture->setFallbackTexture(networkTexture->getFallbackTexture()); texture->setFallbackTexture(networkTexture->getFallbackTexture());
} else {
qCDebug(modelnetworking) << _url << "loading stopped; texture wasn't created";
return;
} }
auto textureCache = DependencyManager::get<TextureCache>(); auto textureCache = DependencyManager::get<TextureCache>();