From 8d3f11a990b9dddd270801f5748367a98be18c27 Mon Sep 17 00:00:00 2001 From: utkarshgautamnyu Date: Wed, 25 Oct 2017 16:27:09 -0700 Subject: [PATCH] moved code to set _textureContent to ModelBaker class --- libraries/baking/src/FBXBaker.cpp | 6 ------ libraries/baking/src/ModelBaker.cpp | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/libraries/baking/src/FBXBaker.cpp b/libraries/baking/src/FBXBaker.cpp index 9e39f60dd5..5085875e07 100644 --- a/libraries/baking/src/FBXBaker.cpp +++ b/libraries/baking/src/FBXBaker.cpp @@ -356,12 +356,6 @@ void FBXBaker::rewriteAndBakeSceneTextures() { if (textureChild.name == "RelativeFilename") { QString fbxTextureFileName { textureChild.properties.at(0).toByteArray() }; - QFileInfo fbxTextureFileInfo { fbxTextureFileName.replace("\\", "/") }; - - QByteArray textureContent = ""; - if (!fbxTextureFileInfo.filePath().isEmpty()) { - textureContent = _textureContent.value(fbxTextureFileName.toLocal8Bit()); - } // Callback to get texture type getTextureTypeCallback textureTypeCallback = [=]() { diff --git a/libraries/baking/src/ModelBaker.cpp b/libraries/baking/src/ModelBaker.cpp index 25dcc8f876..2575a82dfe 100644 --- a/libraries/baking/src/ModelBaker.cpp +++ b/libraries/baking/src/ModelBaker.cpp @@ -216,7 +216,7 @@ bool ModelBaker::compressMesh(FBXMesh& mesh, bool hasDeformers,FBXNode& dracoMes QByteArray* ModelBaker::compressTexture(QString modelTextureFileName, getTextureTypeCallback textureTypeCallback) { static QByteArray textureChild; - QByteArray textureContent; + QByteArray textureContent = ""; image::TextureUsage::Type textureType; if (textureTypeCallback) {