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

Merge pull request #1899 from arkeon7/ColladaTexture 

Correction on Collada parser missing textures when the image is in CDATA
pull/1900/merge
Kim Kulling 2018-04-13 16:32:03 +02:00 committed by GitHub
parent 45892d7fe9 f235646030
commit fce4d0cee7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/ColladaParser.cpp
View File

@ -3106,7 +3106,7 @@ const char* ColladaParser::TestTextContent()
// read contents of the element // read contents of the element
if( !mReader->read() ) if( !mReader->read() )
return NULL; return NULL;
if( mReader->getNodeType() != irr::io::EXN_TEXT) if( mReader->getNodeType() != irr::io::EXN_TEXT && mReader->getNodeType() != irr::io::EXN_CDATA)
return NULL; return NULL;
// skip leading whitespace // skip leading whitespace