Merge branch 'master' of https://github.com/assimp/assimp

2017-05-25 22:40:36 +02:00
parent f3407ef804 b7d4b69e0d
commit 1b4cbcc6ad
40 changed files with 3744 additions and 112 deletions
--- a/code/ObjTools.h
+++ b/code/ObjTools.h
@@ -79,8 +79,10 @@ inline Char_T getNextWord( Char_T pBuffer, Char_T pEnd )
 {
    while ( !isEndOfBuffer( pBuffer, pEnd ) )
    {
-        if( !IsSpaceOrNewLine( *pBuffer ) || IsLineEnd( *pBuffer ) )
-            break;
+        if ( !IsSpaceOrNewLine( *pBuffer ) || IsLineEnd( *pBuffer ) ) {
+            //if ( *pBuffer != '\\' )
+                break;
+        }
        pBuffer++;
    }
    return pBuffer;