From ddbb8ab856e3fae7c8630af537e7241700150629 Mon Sep 17 00:00:00 2001 From: ulfjorensen Date: Tue, 10 Mar 2009 20:47:55 +0000 Subject: [PATCH] Bugfix: XFiles exported from kwxPort with vertex colors load correctly now. git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@363 67173fc5-114c-0410-ac8e-9d2fd5bffc1f --- code/XFileParser.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/code/XFileParser.cpp b/code/XFileParser.cpp index 28b0514b0..e482389c0 100644 --- a/code/XFileParser.cpp +++ b/code/XFileParser.cpp @@ -616,13 +616,14 @@ void XFileParser::ParseDataObjectMeshVertexColors( Mesh* pMesh) ThrowException( "Vertex color index out of bounds"); colors[index] = ReadRGBA(); - // HACK: (thom) Maxon Cinema XPort plugin puts a third separator here. Ignore gracefully - if( !mIsBinaryFormat) - { - FindNextNoneWhiteSpace(); - if( *P == ';') - P++; - } + // HACK: (thom) Maxon Cinema XPort plugin puts a third separator here, kwxPort puts a comma. + // Ignore gracefully. + if( !mIsBinaryFormat) + { + FindNextNoneWhiteSpace(); + if( *P == ';' || *P == ',') + P++; + } } CheckForClosingBrace();