v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #721 from luho383/fbx_file_import 

Fix for FBX Files that do not have a Comma on a new line in a data block
pull/729/head
Alexander Gessler 2015-12-20 00:06:02 +01:00
parent 3b10f69f7e 90ddb93940
commit 891411514b
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
code/FBXParser.cpp
View File

@ -125,13 +125,20 @@ Element::Element(const Token& key_token, Parser& parser)
if (n->Type() == TokenType_DATA) { if (n->Type() == TokenType_DATA) {
tokens.push_back(n); tokens.push_back(n);
TokenPtr prev = n;
n = parser.AdvanceToNextToken(); n = parser.AdvanceToNextToken();
if(!n) { if(!n) {
ParseError("unexpected end of file, expected bracket, comma or key",parser.LastToken()); 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) { if (ty != TokenType_OPEN_BRACKET && ty != TokenType_CLOSE_BRACKET && ty != TokenType_COMMA && ty != TokenType_KEY) {
ParseError("unexpected token; expected bracket, comma or key",n); ParseError("unexpected token; expected bracket, comma or key",n);
} }