- Bugfix: fixed Collada parser to accept empty data elements again

- Workaround: added a little extra code to handle texture filenames of Maxon Cinema Collada Exporter 

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1231 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
This commit is contained in:
ulfjorensen
2012-04-02 10:43:18 +00:00
parent 07841c3e13
commit 5975f3eff2
2 changed files with 15 additions and 6 deletions

View File

@@ -1399,6 +1399,15 @@ void ColladaLoader::ConvertPath (aiString& ss)
ss.data[ss.length] = '\0';
}
// Maxon Cinema Collada Export writes "file:///C:\andsoon" with three slashes...
// I need to filter it without destroying linux paths starting with "/somewhere"
if( ss.data[0] == '/' && isalpha( ss.data[1]) && ss.data[2] == ':' )
{
ss.length--;
memmove( ss.data, ss.data+1, ss.length);
ss.data[ss.length] = 0;
}
// find and convert all %xyz special chars
char* out = ss.data;
for( const char* it = ss.data; it != ss.data + ss.length; /**/ )