From b7ecffa0beba9a47969e97f69063ab761a613781 Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Wed, 29 Jul 2015 17:55:56 -0700
Subject: [PATCH] treat a "g" in an obj file the same as a "o"

---
 libraries/fbx/src/OBJReader.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libraries/fbx/src/OBJReader.cpp b/libraries/fbx/src/OBJReader.cpp
index f16c6ba215..da63b2f47f 100644
--- a/libraries/fbx/src/OBJReader.cpp
+++ b/libraries/fbx/src/OBJReader.cpp
@@ -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);