From 90ddb93940bae9f37828882bf1571c078e6b25c6 Mon Sep 17 00:00:00 2001 From: "lutz.hoeren" Date: Thu, 17 Dec 2015 11:48:44 +0100 Subject: [PATCH] Fix for FBX Files that do not have a Comma on a new line in a data block --- code/FBXParser.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/code/FBXParser.cpp b/code/FBXParser.cpp index 0368d52e9..5961ac4ed 100644 --- a/code/FBXParser.cpp +++ b/code/FBXParser.cpp @@ -125,13 +125,20 @@ Element::Element(const Token& key_token, Parser& parser) if (n->Type() == TokenType_DATA) { tokens.push_back(n); - + TokenPtr prev = n; n = parser.AdvanceToNextToken(); if(!n) { ParseError("unexpected end of file, expected bracket, comma or key",parser.LastToken()); } - const TokenType ty = n->Type(); + const TokenType ty = n->Type(); + + // some exporters are missing a comma on the next line + if (ty == TokenType_DATA && prev->Type() == TokenType_DATA && (n->Line() == prev->Line() + 1)) { + tokens.push_back(n); + continue; + } + if (ty != TokenType_OPEN_BRACKET && ty != TokenType_CLOSE_BRACKET && ty != TokenType_COMMA && ty != TokenType_KEY) { ParseError("unexpected token; expected bracket, comma or key",n); }