Merge branch 'master' into kimkulling_dev

This commit is contained in:
Kim Kulling
2020-03-23 09:00:41 +01:00
committed by GitHub
275 changed files with 24219 additions and 23083 deletions

View File

@@ -297,11 +297,12 @@ void UnrealImporter::InternReadFile( const std::string& pFile,
// read number of frames
const uint32_t numFrames = a_reader.GetI2();
if (configFrameID >= numFrames)
if (configFrameID >= numFrames) {
throw DeadlyImportError("UNREAL: The requested frame does not exist");
}
uint32_t st = a_reader.GetI2();
if (st != numVert*4)
if (st != numVert*4u)
throw DeadlyImportError("UNREAL: Unexpected aniv file length");
// skip to our frame