Merge branch 'master' into fix_obj_progress_reporting

2019-01-09 22:09:25 +01:00
parent e37a4de2c2 13ce4a6292
commit 19c3cea0db
23 changed files with 3474 additions and 2921 deletions
--- a/code/ObjFileParser.cpp
+++ b/code/ObjFileParser.cpp
@@ -118,7 +118,7 @@ void ObjFileParser::parseFile( IOStreamBuffer<char> &streamBuffer ) {
    size_t lastFilePos( 0 );

    std::vector<char> buffer;
-    while ( streamBuffer.getNextDataLine( buffer, '\\' ) ) {
+    while ( streamBuffer.getNextDataLine( buffer, '\0' ) ) {
        m_DataIt = buffer.begin();
        m_DataItEnd = buffer.end();