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

Fix: scene validation forgets to validate aiScene::mTextures. 

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@678 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
pull/1/head
aramis_acg 2010-04-13 21:06:03 +00:00
parent 906c45eeeb
commit 0d3490c00c
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
code/ValidateDataStructure.cpp
View File

@ -246,6 +246,15 @@ void ValidateDSProcess::Execute( aiScene* pScene)
else if (pScene->mLights) { else if (pScene->mLights) {
ReportError("aiScene::mLights is non-null although there are no lights"); ReportError("aiScene::mLights is non-null although there are no lights");
} }
// validate all textures
if (pScene->mNumTextures) {
DoValidation(pScene->mTextures,pScene->mNumTextures,
"mTextures","mNumTextures");
}
else if (pScene->mTextures) {
ReportError("aiScene::mTextures is non-null although there are no textures");
}
// validate all materials // validate all materials
if (pScene->mNumMaterials) { if (pScene->mNumMaterials) {
@ -767,7 +776,7 @@ void ValidateDSProcess::Validate( const aiTexture* pTexture)
(sz[1] >= 'A' && sz[1] <= 'Z') || (sz[1] >= 'A' && sz[1] <= 'Z') ||
(sz[2] >= 'A' && sz[2] <= 'Z') || (sz[2] >= 'A' && sz[2] <= 'Z') ||
(sz[3] >= 'A' && sz[3] <= 'Z')) { (sz[3] >= 'A' && sz[3] <= 'Z')) {
ReportError("aiTexture::achFormatHint contains non-lowercase characters"); ReportError("aiTexture::achFormatHint contains non-lowercase letters");
} }
} }