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

C4D. Fix merge conflicts

Browse Source
This commit is contained in:
Kim Kulling
2022-01-18 22:21:58 +01:00
committed by GitHub
parent ea5996307a
commit c3b91dd766
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/AssetLib/C4D/C4DImporter.cpp
View File

@@ -117,13 +117,15 @@ C4DImporter::~C4DImporter() {
}
// ------------------------------------------------------------------------------------------------
bool C4DImporter::CanRead( const std::string& /*pFile*/, IOSystem* /*pIOHandler*/, bool /*checkSig*/) const {
const std::string& extension = GetExtension(pFile);
bool C4DImporter::CanRead( const std::string& pFile, IOSystem* /*pIOHandler*/, bool /*checkSig*/) const {
const std::string& extension = GetExtension(pFile);
if (extension == "c4d") {
return true;
} else if ((!extension.length() || checkSig) && pIOHandler) {
// TODO
}
return false;
}
// ------------------------------------------------------------------------------------------------