From f929fa3bcb6685b25cff6ac632e408ef4d0f3be6 Mon Sep 17 00:00:00 2001 From: David Back Date: Thu, 8 Feb 2018 14:50:30 -0800 Subject: [PATCH] filename space fix --- libraries/fbx/src/OBJReader.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/libraries/fbx/src/OBJReader.cpp b/libraries/fbx/src/OBJReader.cpp index 3cc4efebf2..2386afe677 100644 --- a/libraries/fbx/src/OBJReader.cpp +++ b/libraries/fbx/src/OBJReader.cpp @@ -355,7 +355,7 @@ void OBJReader::parseTextureLine(const QByteArray& textureLine, QByteArray& file int i = 0; while (i < parser.size()) { - if (i + 1 < parser.size()) { + if (i + 1 < parser.size() && parser[i][0] == '-') { const std::string& option = parser[i++]; if (option == "-blendu" || option == "-blendv") { #ifdef WANT_DEBUG @@ -424,8 +424,12 @@ void OBJReader::parseTextureLine(const QByteArray& textureLine, QByteArray& file qCDebug(modelformat) << "OBJ Reader WARNING: Ignoring unsupported texture option" << option.c_str(); #endif } - } else { // assume filename at end - filename = parser[i++].c_str(); + } else { // assume filename at end when no more options + std::string filenameString = parser[i++]; + while (i < parser.size()) { // filename has space in it + filenameString += " " + parser[i++]; + } + filename = filenameString.c_str(); } } }