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

moved code to set _textureContent to ModelBaker class

Browse source
This commit is contained in:
utkarshgautamnyu 2017-10-25 16:27:09 -07:00
parent d7f2e21dca
commit 8d3f11a990
2 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libraries/baking/src/FBXBaker.cpp
View file

@ -356,12 +356,6 @@ void FBXBaker::rewriteAndBakeSceneTextures() {
if (textureChild.name == "RelativeFilename") { if (textureChild.name == "RelativeFilename") {
QString fbxTextureFileName { textureChild.properties.at(0).toByteArray() }; 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 // Callback to get texture type
getTextureTypeCallback textureTypeCallback = [=]() { getTextureTypeCallback textureTypeCallback = [=]() {

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

@ -216,7 +216,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;
if (textureTypeCallback) { if (textureTypeCallback) {