Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix crash when bouncing to escotology, which may or may not be related

Browse source
This commit is contained in:
Brad Hefta-Gaub 2016-09-30 17:43:26 -07:00
parent 4c5bf3119e
commit 2cba3db2b6
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
libraries/model-networking/src/model-networking/ModelCache.cpp
View file

@ -377,8 +377,10 @@ void GeometryResource::deleter() {
} }
void GeometryResource::setTextures() { void GeometryResource::setTextures() {
for (const FBXMaterial& material : _fbxGeometry->materials) { if (_fbxGeometry) {
_materials.push_back(std::make_shared<NetworkMaterial>(material, _textureBaseUrl)); for (const FBXMaterial& material : _fbxGeometry->materials) {
_materials.push_back(std::make_shared<NetworkMaterial>(material, _textureBaseUrl));
}
} }
} }
@ -457,7 +459,9 @@ model::TextureMapPointer NetworkMaterial::fetchTextureMap(const QUrl& baseUrl, c
_textures[channel] = Texture { fbxTexture.name, texture }; _textures[channel] = Texture { fbxTexture.name, texture };
auto map = std::make_shared<model::TextureMap>(); auto map = std::make_shared<model::TextureMap>();
map->setTextureSource(texture->_textureSource); if (texture) {
map->setTextureSource(texture->_textureSource);
}
map->setTextureTransform(fbxTexture.transform); map->setTextureTransform(fbxTexture.transform);
return map; return map;