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

Use correct textureBaseUrl

Browse source
This commit is contained in:
Zach Pomerantz 2016-03-25 13:17:29 -07:00
parent fac54b6ee3
commit b90f2b2e0a
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -157,7 +157,7 @@ class GeometryDefinitionResource : public GeometryResource {
Q_OBJECT
public:
GeometryDefinitionResource(const QUrl& url, const QVariantHash& mapping, const QUrl& textureBaseUrl) :
GeometryResource(url), _mapping(mapping), _textureBaseUrl(textureBaseUrl) {}
GeometryResource(url), _mapping(mapping), _textureBaseUrl(textureBaseUrl.isValid() ? textureBaseUrl : url) {}
virtual void downloadFinished(const QByteArray& data) override;
@ -497,4 +497,3 @@ void NetworkMaterial::setTextures(const QVariantMap& textureMap) {
}
#include "ModelCache.moc"