Ver código fonte

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
aramis_acg 15 anos atrás
pai
commit
0d3490c00c
1 arquivos alterados com 10 adições e 1 exclusões
  1. 10 1
      code/ValidateDataStructure.cpp

+ 10 - 1
code/ValidateDataStructure.cpp

@@ -246,6 +246,15 @@ void ValidateDSProcess::Execute( aiScene* pScene)
 	else if (pScene->mLights)	{
 		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
 	if (pScene->mNumMaterials) {
@@ -767,7 +776,7 @@ void ValidateDSProcess::Validate( const aiTexture* pTexture)
 		(sz[1] >= 'A' && sz[1] <= 'Z') ||
 		(sz[2] >= 'A' && sz[2] <= 'Z') ||
 		(sz[3] >= 'A' && sz[3] <= 'Z'))	{
-		ReportError("aiTexture::achFormatHint contains non-lowercase characters");
+		ReportError("aiTexture::achFormatHint contains non-lowercase letters");
 	}
 }