mirror of
https://github.com/overte-org/overte.git
synced 2025-08-10 02:52:57 +02:00
Fix for -Wreorder warning
This commit is contained in:
parent
1092c09e8b
commit
d8b0a6360e
2 changed files with 3 additions and 3 deletions
|
@ -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();
|
||||||
|
|
|
@ -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;
|
||||||
|
|
Loading…
Reference in a new issue