blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 743 Projects 19 Wiki Activity

partial revert ab6417aa9f was too strict

This commit is contained in:
Gaia Clary 2014-12-22 13:26:15 +01:00
parent abf39fa31f
commit f78490182e
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source/blender/collada/ErrorHandler.cpp
View File

@ -47,7 +47,7 @@ ErrorHandler::~ErrorHandler()
//--------------------------------------------------------------------
bool ErrorHandler::handleError(const COLLADASaxFWL::IError *error)
{
bool pass = false;
bool isError = true;
if (error->getErrorClass() == COLLADASaxFWL::IError::ERROR_SAXPARSER) {
COLLADASaxFWL::SaxParserError *saxParserError = (COLLADASaxFWL::SaxParserError *) error;
@ -56,14 +56,14 @@ 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) {
pass = true;
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)))
{
pass = true;
isError = false;
}
}
@ -80,7 +80,7 @@ bool ErrorHandler::handleError(const COLLADASaxFWL::IError *error)
* This makes the importer more gracefull, so it now imports what makes sense.
*/
if (saxFWLError->getSeverity() == COLLADASaxFWL::IError::SEVERITY_ERROR_NONCRITICAL) {
pass = true;
isError = false;
}
std::cout << "Sax FWL Error: " << saxFWLError->getErrorMessage() << std::endl;
@ -89,8 +89,7 @@ bool ErrorHandler::handleError(const COLLADASaxFWL::IError *error)
std::cout << "opencollada error: " << error->getFullErrorMessage() << std::endl;
}
if (!pass)
mError = true;
mError |= isError;
return pass;
return false; // let OpenCollada decide when to abort
}