Merge branch 'master' into new_obj_stream_handling

2016-10-22 21:04:02 +02:00
parent d3a3bd9c12 1724cc9e66
commit cbe2e9af49
58 changed files with 840 additions and 11256 deletions
--- a/code/ObjFileParser.cpp
+++ b/code/ObjFileParser.cpp
@@ -184,9 +184,14 @@ void ObjFileParser::parseFile( IOStreamBuffer<char> &streamBuffer ) {

        case 'm': // Parse a material library or merging group ('mg')
            {
-				std::string name;
+                std::string name;
+
+                getName(m_DataIt, m_DataItEnd, name);
+
+                size_t nextSpace = name.find(" ");
+                if (nextSpace != std::string::npos)
+                    name = name.substr(0, nextSpace);

-				getName(m_DataIt, m_DataItEnd, name);
                if (name == "mg")
                    getGroupNumberAndResolution();
                else if(name == "mtllib")