From 5901ab63812eb136c7f58d98a0625064aca86073 Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Thu, 20 Apr 2017 23:38:22 -0700 Subject: [PATCH] Fix initalization order warnings in KTX.h and TextureCache.cpp --- libraries/ktx/src/ktx/KTX.h | 2 +- .../model-networking/src/model-networking/TextureCache.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/ktx/src/ktx/KTX.h b/libraries/ktx/src/ktx/KTX.h index 713733b1dd..e84cba085d 100644 --- a/libraries/ktx/src/ktx/KTX.h +++ b/libraries/ktx/src/ktx/KTX.h @@ -419,8 +419,8 @@ namespace ktx { // This is the byte offset from the _start_ of the image region. For example, level 0 // will have a byte offset of 0. - const uint32_t _imageOffset; const uint32_t _numFaces; + const uint32_t _imageOffset; const uint32_t _imageSize; const uint32_t _faceSize; const uint32_t _padding; diff --git a/libraries/model-networking/src/model-networking/TextureCache.cpp b/libraries/model-networking/src/model-networking/TextureCache.cpp index 0bfca1f1fb..05cfc7c06e 100644 --- a/libraries/model-networking/src/model-networking/TextureCache.cpp +++ b/libraries/model-networking/src/model-networking/TextureCache.cpp @@ -272,8 +272,8 @@ QSharedPointer TextureCache::createResource(const QUrl& url, const QSh NetworkTexture::NetworkTexture(const QUrl& url, image::TextureUsage::Type type, const QByteArray& content, int maxNumPixels) : Resource(url), _type(type), - _maxNumPixels(maxNumPixels), - _sourceIsKTX(url.path().endsWith(".ktx")) + _sourceIsKTX(url.path().endsWith(".ktx")), + _maxNumPixels(maxNumPixels) { _textureSource = std::make_shared();