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

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

View file

@ -306,7 +306,8 @@ bool OBJReader::parseOBJGroup(OBJTokenizer& tokenizer, const QVariantHash& mappi
}
QByteArray token = tokenizer.getDatum();
//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) {
// we've encountered the beginning of the next group.
tokenizer.pushBackToken(OBJTokenizer::DATUM_TOKEN);