Fix mesh load issue & merge issue

This commit is contained in:
James Urquhart 2016-08-21 02:15:26 +01:00
parent 41dfb64210
commit e7db0d7956
4 changed files with 7 additions and 5 deletions

View file

@ -732,7 +732,7 @@ void TSShape::initVertexBufferPointers()
mesh->getMeshType() == TSMesh::SkinMeshType))
{
// Set buffer
AssertFatal(mesh->mNumVerts >= mesh->vertsPerFrame, "invalid verts per frame");
AssertFatal(mesh->mNumVerts == 0 || mesh->mNumVerts >= mesh->vertsPerFrame, "invalid verts per frame");
if (mesh->mVertSize > 0 && !mesh->mVertexData.isReady())
{
U32 boneOffset = 0;