From d8b0a6360e2360296ee01be0f1aceb3912155578 Mon Sep 17 00:00:00 2001 From: utkarshgautamnyu Date: Thu, 26 Oct 2017 13:11:59 -0700 Subject: [PATCH] Fix for -Wreorder warning --- libraries/baking/src/ModelBaker.cpp | 2 +- libraries/baking/src/ModelBaker.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/baking/src/ModelBaker.cpp b/libraries/baking/src/ModelBaker.cpp index 19e15c8377..07cb722f59 100644 --- a/libraries/baking/src/ModelBaker.cpp +++ b/libraries/baking/src/ModelBaker.cpp @@ -226,7 +226,7 @@ bool ModelBaker::compressMesh(FBXMesh& mesh, bool hasDeformers,FBXNode& dracoMes QByteArray* ModelBaker::compressTexture(QString modelTextureFileName, getTextureTypeCallback textureTypeCallback) { static QByteArray textureChild; QByteArray textureContent = ""; - image::TextureUsage::Type textureType; + image::TextureUsage::Type textureType = image::TextureUsage::Type::DEFAULT_TEXTURE; if (textureTypeCallback) { textureType = textureTypeCallback(); diff --git a/libraries/baking/src/ModelBaker.h b/libraries/baking/src/ModelBaker.h index bb1b5e7c11..ad56a84343 100644 --- a/libraries/baking/src/ModelBaker.h +++ b/libraries/baking/src/ModelBaker.h @@ -44,10 +44,10 @@ protected: void checkIfTexturesFinished(); QHash textureContentMap; + QUrl modelURL; + TextureBakerThreadGetter textureThreadGetter; QString bakedOutputDir; QString originalOutputDir; - TextureBakerThreadGetter textureThreadGetter; - QUrl modelURL; QString bakedModelFilePath; QDir modelTempDir; QString originalModelFilePath;