From c3b91dd766267119e06ee032124a0a4977897838 Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Tue, 18 Jan 2022 22:21:58 +0100 Subject: [PATCH] C4D. Fix merge conflicts --- code/AssetLib/C4D/C4DImporter.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/code/AssetLib/C4D/C4DImporter.cpp b/code/AssetLib/C4D/C4DImporter.cpp index b14df4300..06d7a3412 100644 --- a/code/AssetLib/C4D/C4DImporter.cpp +++ b/code/AssetLib/C4D/C4DImporter.cpp @@ -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; } // ------------------------------------------------------------------------------------------------