Actually, just keep the old behaviour for now.

This commit is contained in:
Malcolm Tyrrell
2020-08-20 14:32:15 +01:00
parent 9b5e758bdd
commit 8f893e3653
4 changed files with 10 additions and 13 deletions
+1 -6
View File
@@ -130,14 +130,9 @@ aiScene *BaseImporter::ReadFile(Importer *pImp, const std::string &pFile, IOSyst
// passes scale into ScaleProcess
UpdateImporterScale(pImp);
} catch( const DeadlyImportError& err ) {
} catch( const std::exception &err ) {
// extract error description
m_ErrorText = err.what();
ASSIMP_LOG_ERROR(m_ErrorText.c_str());
m_Exception = std::current_exception();
return nullptr;
} catch( const std::exception& err ) {
m_ErrorText = "Internal error";
ASSIMP_LOG_ERROR(err.what());
m_Exception = std::current_exception();
return nullptr;
+2 -3
View File
@@ -97,9 +97,8 @@ public:
/** The imported data, if ReadFile() was successful, nullptr otherwise. */
aiScene* mScene;
/** The error description, if there was one. In the case of a
* failure not caused by a DeadlyImportError, mInternalException will
* carry the full details and this will be just "Internal error". */
/** The error description, if there was one. In the case of an exception,
* mException will carry the full details. */
std::string mErrorString;
/** Any exception which occurred */