diff options
Diffstat (limited to 'source/blender/collada/ErrorHandler.cpp')
-rw-r--r-- | source/blender/collada/ErrorHandler.cpp | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/source/blender/collada/ErrorHandler.cpp b/source/blender/collada/ErrorHandler.cpp index 7ac138ac807..b271604f839 100644 --- a/source/blender/collada/ErrorHandler.cpp +++ b/source/blender/collada/ErrorHandler.cpp @@ -34,6 +34,8 @@ #include <string.h> +#include "BLI_utildefines.h" + //-------------------------------------------------------------------- ErrorHandler::ErrorHandler() : mError(false) { @@ -47,7 +49,7 @@ ErrorHandler::~ErrorHandler() //-------------------------------------------------------------------- bool ErrorHandler::handleError(const COLLADASaxFWL::IError *error) { - mError = true; + bool isError = true; if (error->getErrorClass() == COLLADASaxFWL::IError::ERROR_SAXPARSER) { COLLADASaxFWL::SaxParserError *saxParserError = (COLLADASaxFWL::SaxParserError *) error; @@ -55,15 +57,15 @@ bool ErrorHandler::handleError(const COLLADASaxFWL::IError *error) // Workaround to avoid wrong error if (parserError.getErrorType() == GeneratedSaxParser::ParserError::ERROR_VALIDATION_MIN_OCCURS_UNMATCHED) { - if (strcmp(parserError.getElement(), "effect") == 0) { - mError = false; + if (STREQ(parserError.getElement(), "effect")) { + isError = false; } } if (parserError.getErrorType() == GeneratedSaxParser::ParserError::ERROR_VALIDATION_SEQUENCE_PREVIOUS_SIBLING_NOT_PRESENT) { - if (!((strcmp(parserError.getElement(), "extra") == 0) && - (strcmp(parserError.getAdditionalText().c_str(), "sibling: fx_profile_abstract") == 0))) + if (!(STREQ(parserError.getElement(), "extra") && + STREQ(parserError.getAdditionalText().c_str(), "sibling: fx_profile_abstract"))) { - mError = false; + isError = false; } } @@ -75,11 +77,21 @@ bool ErrorHandler::handleError(const COLLADASaxFWL::IError *error) } else if (error->getErrorClass() == COLLADASaxFWL::IError::ERROR_SAXFWL) { COLLADASaxFWL::SaxFWLError *saxFWLError = (COLLADASaxFWL::SaxFWLError *) error; + /* + * Accept non critical errors as warnings (i.e. texture not found) + * This makes the importer more gracefull, so it now imports what makes sense. + */ + if (saxFWLError->getSeverity() == COLLADASaxFWL::IError::SEVERITY_ERROR_NONCRITICAL) { + isError = false; + } + std::cout << "Sax FWL Error: " << saxFWLError->getErrorMessage() << std::endl; } else { std::cout << "opencollada error: " << error->getFullErrorMessage() << std::endl; } - return false; + mError |= isError; + + return false; // let OpenCollada decide when to abort } |