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

Merge 'samuel/fst' into gltf_mat-support

Browse source
This commit is contained in:
sabrina-shanman 2019-02-11 09:28:29 -08:00
commit 0fda6bd3e0
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -336,12 +336,8 @@ int networkTexturePointerMetaTypeId = qRegisterMetaType<QWeakPointer<NetworkText
NetworkTexture::NetworkTexture(const QUrl& url) : NetworkTexture::NetworkTexture(const QUrl& url) :
Resource(url), Resource(url),
_type(),
_maxNumPixels(100) _maxNumPixels(100)
{ {
_textureSource = std::make_shared<gpu::TextureSource>(url);
_lowestRequestedMipLevel = 0;
_loaded = true;
} }
NetworkTexture::NetworkTexture(const NetworkTexture& other) : NetworkTexture::NetworkTexture(const NetworkTexture& other) :
@ -1165,7 +1161,7 @@ void ImageReader::read() {
} }
auto networkTexture = resource.staticCast<NetworkTexture>(); auto networkTexture = resource.staticCast<NetworkTexture>();
// Hash the source image and extra to for KTX caching // Hash the source image and extraHash for KTX caching
std::string hash; std::string hash;
{ {
QCryptographicHash hasher(QCryptographicHash::Md5); QCryptographicHash hasher(QCryptographicHash::Md5);