FIX: (aiMesh::mNumTextureCoords[n] == 0) is now propagated to 2.

Removed ATMNotUptoDate tag from SCons dir. The SCons script is generic.
Updated list of contributors.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@275 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
pull/1/head
aramis_acg 2009-01-08 22:44:07 +00:00
parent e48d1a4e5a
commit 62a8f43ffe
4 changed files with 10 additions and 4 deletions

View File

@ -47,3 +47,6 @@ supplied various XFiles for testing purposes.
- Tizian Wieland - Tizian Wieland
searched the web for several thousands of test models for internal use searched the web for several thousands of test models for internal use
- John Connors
supplied patches for linux and SCons.

View File

@ -116,7 +116,7 @@ inline const char* TextureTypeToString(aiTextureType in)
case aiTextureType_SHININESS: case aiTextureType_SHININESS:
return "Shininess"; return "Shininess";
default: default:
return "LARGE ERROR, please leave the room immediately and call the police"; return "HUGE ERROR, please leave the room immediately and call the police";
} }
} }
@ -139,7 +139,7 @@ inline const char* MappingTypeToString(aiTextureMapping in)
case aiTextureMapping_OTHER: case aiTextureMapping_OTHER:
return "Other"; return "Other";
default: default:
return "LARGE ERROR, please leave the room immediately and call the police"; return "HUGE ERROR, please leave the room immediately and call the police";
} }
} }
@ -187,5 +187,5 @@ class DestroySpatialSortProcess : public BaseProcess
} }
}; };
} // !! Assimp } // ! namespace Assimp
#endif // !! AI_PROCESS_HELPER_H_INCLUDED #endif // !! AI_PROCESS_HELPER_H_INCLUDED

View File

@ -69,7 +69,10 @@ void ScenePreprocessor::ProcessMesh (aiMesh* mesh)
// If aiMesh::mNumUVComponents is *not* set assign the default value of 2 // If aiMesh::mNumUVComponents is *not* set assign the default value of 2
for (unsigned int i = 0; i < AI_MAX_NUMBER_OF_TEXTURECOORDS; ++i) for (unsigned int i = 0; i < AI_MAX_NUMBER_OF_TEXTURECOORDS; ++i)
{ {
if (!mesh->mNumUVComponents[i]) if (!mesh->mTextureCoords[i])
mesh->mNumUVComponents[i] = 0;
else if( !mesh->mNumUVComponents[i])
mesh->mNumUVComponents[i] = 2; mesh->mNumUVComponents[i] = 2;
} }