diff --git a/libraries/gpu/src/gpu/Texture.h b/libraries/gpu/src/gpu/Texture.h index 19add9a47e..1cd9d0b29b 100755 --- a/libraries/gpu/src/gpu/Texture.h +++ b/libraries/gpu/src/gpu/Texture.h @@ -56,12 +56,12 @@ public: glm::vec4 _borderColor{ 1.0f }; uint32 _maxAnisotropy = 16; + uint8 _filter = FILTER_MIN_MAG_POINT; + uint8 _comparisonFunc = ALWAYS; + uint8 _wrapModeU = WRAP_REPEAT; uint8 _wrapModeV = WRAP_REPEAT; uint8 _wrapModeW = WRAP_REPEAT; - - uint8 _filter = FILTER_MIN_MAG_POINT; - uint8 _comparisonFunc = ALWAYS; uint8 _mipOffset = 0; uint8 _minMip = 0; diff --git a/libraries/networking/src/ResourceCache.cpp b/libraries/networking/src/ResourceCache.cpp index 54afa98505..c66ae4ce1d 100644 --- a/libraries/networking/src/ResourceCache.cpp +++ b/libraries/networking/src/ResourceCache.cpp @@ -241,7 +241,7 @@ float Resource::getLoadPriority() { } void Resource::refresh() { - if (_reply == nullptr && !(_loaded || _failedToLoad)) { + if (_reply && !(_loaded || _failedToLoad)) { return; } if (_reply) { @@ -351,6 +351,7 @@ void Resource::maybeRefresh() { QDateTime lastModifiedOld = metaData.lastModified(); if (lastModified.isValid() && lastModifiedOld.isValid() && lastModifiedOld == lastModified) { + qCDebug(networking) << "Using cached version of" << _url.fileName(); // We don't need to update, return return; }