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

Fix for -Wreorder warning

Browse source
This commit is contained in:
utkarshgautamnyu 2017-10-26 13:11:59 -07:00
parent 1092c09e8b
commit d8b0a6360e
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/baking/src/ModelBaker.cpp
View file

@ -226,7 +226,7 @@ bool ModelBaker::compressMesh(FBXMesh& mesh, bool hasDeformers,FBXNode& dracoMes
QByteArray* ModelBaker::compressTexture(QString modelTextureFileName, getTextureTypeCallback textureTypeCallback) { QByteArray* ModelBaker::compressTexture(QString modelTextureFileName, getTextureTypeCallback textureTypeCallback) {
static QByteArray textureChild; static QByteArray textureChild;
QByteArray textureContent = ""; QByteArray textureContent = "";
image::TextureUsage::Type textureType; image::TextureUsage::Type textureType = image::TextureUsage::Type::DEFAULT_TEXTURE;
if (textureTypeCallback) { if (textureTypeCallback) {
textureType = textureTypeCallback(); textureType = textureTypeCallback();

4
libraries/baking/src/ModelBaker.h
View file

@ -44,10 +44,10 @@ protected:
void checkIfTexturesFinished(); void checkIfTexturesFinished();
QHash<QByteArray, QByteArray> textureContentMap; QHash<QByteArray, QByteArray> textureContentMap;
QUrl modelURL;
TextureBakerThreadGetter textureThreadGetter;
QString bakedOutputDir; QString bakedOutputDir;
QString originalOutputDir; QString originalOutputDir;
TextureBakerThreadGetter textureThreadGetter;
QUrl modelURL;
QString bakedModelFilePath; QString bakedModelFilePath;
QDir modelTempDir; QDir modelTempDir;
QString originalModelFilePath; QString originalModelFilePath;