From ca645a493c5813a299601d66f5b5f52146b2d22a Mon Sep 17 00:00:00 2001 From: aramis_acg Date: Fri, 11 Jun 2010 14:38:31 +0000 Subject: [PATCH] MDL loader now checks for magic bytes even if the file extension is .mdl. git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@754 67173fc5-114c-0410-ac8e-9d2fd5bffc1f --- code/MDLLoader.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/code/MDLLoader.cpp b/code/MDLLoader.cpp index 8c5742136..85bb59b4b 100644 --- a/code/MDLLoader.cpp +++ b/code/MDLLoader.cpp @@ -80,11 +80,9 @@ MDLImporter::~MDLImporter() bool MDLImporter::CanRead( const std::string& pFile, IOSystem* pIOHandler, bool checkSig) const { const std::string extension = GetExtension(pFile); - if (extension == "mdl" ) - return true; // if check for extension is not enough, check for the magic tokens - if (!extension.length() || checkSig) { + if (extension == "mdl" || !extension.length() || checkSig) { uint32_t tokens[8]; tokens[0] = AI_MDL_MAGIC_NUMBER_LE_HL2a; tokens[1] = AI_MDL_MAGIC_NUMBER_LE_HL2b; @@ -94,10 +92,11 @@ bool MDLImporter::CanRead( const std::string& pFile, IOSystem* pIOHandler, bool tokens[5] = AI_MDL_MAGIC_NUMBER_LE_GS4; tokens[6] = AI_MDL_MAGIC_NUMBER_LE_GS3; tokens[7] = AI_MDL_MAGIC_NUMBER_LE; - return CheckMagicToken(pIOHandler,pFile,tokens,7,0); + return CheckMagicToken(pIOHandler,pFile,tokens,8,0); } return false; } + // ------------------------------------------------------------------------------------------------ // Setup configuration properties void MDLImporter::SetupProperties(const Importer* pImp)