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

Merge pull request #5460 from sethalves/obj-o-means-meshpart

Browse source 
treat a "o" in an obj file as if it were a "g"
This commit is contained in:
Howard Stearns 2015-07-29 18:11:41 -07:00
commit 84fd67ca7a
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libraries/fbx/src/OBJReader.cpp
View file

@ -306,7 +306,8 @@ bool OBJReader::parseOBJGroup(OBJTokenizer& tokenizer, const QVariantHash& mappi
} }
QByteArray token = tokenizer.getDatum(); QByteArray token = tokenizer.getDatum();
//qCDebug(modelformat) << token; //qCDebug(modelformat) << token;
if (token == "g") { // we don't support separate objects in the same file, so treat "o" the same as "g".
if (token == "g" || token == "o") {
if (sawG) { if (sawG) {
// we've encountered the beginning of the next group. // we've encountered the beginning of the next group.
tokenizer.pushBackToken(OBJTokenizer::DATUM_TOKEN); tokenizer.pushBackToken(OBJTokenizer::DATUM_TOKEN);