Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix merge issues

Browse Source
This commit is contained in:
Kim Kulling
2022-01-16 20:57:56 +01:00
parent 05746acb07
commit acd70b35a0
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/AssetLib/Blender/BlenderLoader.cpp
+3 -1
View File
@@ -120,7 +120,9 @@ static const char * const TokensForSearch[] = { "blender" };
// Returns whether the class can handle the format of the given file.
bool BlenderImporter::CanRead(const std::string &pFile, IOSystem *pIOHandler, bool /*checkSig*/) const {
// note: this won't catch compressed files
return SearchFileHeaderForToken(pIOHandler, pFile, TokensForSearch, AI_COUNT_OF(TokensForSearch));
static const char *tokens[] = { "<BLENDER", "blender" };
return SearchFileHeaderForToken(pIOHandler, pFile, tokens, AI_COUNT_OF(tokens));
}
// ------------------------------------------------------------------------------------------------