Commit: 14bb6a964a1632943102c5153b36f559872a0435
Author: Gaia Clary
Date: Wed Oct 24 22:06:40 2018 +0200
Branches: collada
https://developer.blender.org/rB14bb6a964a1632943102c5153b36f559872a0435
fix: Collada: Error handler does not report Parsing errors and continues
processing instead of stopping the import/export
===================================================================
M source/blender/collada/ErrorHandler.cpp
M source/blender/editors/io/io_collada.c
===================================================================
diff --git a/source/blender/collada/ErrorHandler.cpp
b/source/blender/collada/ErrorHandler.cpp
index caa73900632..22ec432d237 100644
--- a/source/blender/collada/ErrorHandler.cpp
+++ b/source/blender/collada/ErrorHandler.cpp
@@ -49,47 +49,64 @@ ErrorHandler::~ErrorHandler()
//--------------------------------------------------------------------
bool ErrorHandler::handleError(const COLLADASaxFWL::IError *error)
{
- /* This method must return true when Collada should continue.
+ /* This method must return false when Collada should continue.
* See https://github.com/KhronosGroup/OpenCOLLADA/issues/442
*/
- bool isWarning = false;
+ bool isError = true;
+ std::string error_context;
+ std::string error_message;
if (error->getErrorClass() == COLLADASaxFWL::IError::ERROR_SAXPARSER) {
+ error_context = "Schema validation";
+
COLLADASaxFWL::SaxParserError *saxParserError =
(COLLADASaxFWL::SaxParserError *) error;
const GeneratedSaxParser::ParserError& parserError =
saxParserError->getError();
+ error_message = parserError.getErrorMessage();
- // Workaround to avoid wrong error
if (parserError.getErrorType() ==
GeneratedSaxParser::ParserError::ERROR_VALIDATION_MIN_OCCURS_UNMATCHED) {
if (STREQ(parserError.getElement(), "effect")) {
- isWarning = true;
+ isError = false;
}
}
+
if (parserError.getErrorType() ==
GeneratedSaxParser::ParserError::ERROR_VALIDATION_SEQUENCE_PREVIOUS_SIBLING_NOT_PRESENT)
{
if (!(STREQ(parserError.getElement(), "extra") &&
STREQ(parserError.getAdditionalText().c_str(),
"sibling: fx_profile_abstract")))
{
- isWarning = true;
+ isError = false;
}
}
if (parserError.getErrorType() ==
GeneratedSaxParser::ParserError::ERROR_COULD_NOT_OPEN_FILE) {
- std::cout << "Couldn't open file" << std::endl;
+ isError = true;
+ error_context = "File access";
}
-
- std::cout << "Schema validation error: " <<
parserError.getErrorMessage() << std::endl;
}
else if (error->getErrorClass() == COLLADASaxFWL::IError::ERROR_SAXFWL)
{
+ error_context = "Sax FWL";
COLLADASaxFWL::SaxFWLError *saxFWLError =
(COLLADASaxFWL::SaxFWLError *) error;
+ error_message = saxFWLError->getErrorMessage();
+
/*
* Accept non critical errors as warnings (i.e. texture not
found)
* This makes the importer more graceful, so it now imports
what makes sense.
*/
- isWarning = (saxFWLError->getSeverity() ==
COLLADASaxFWL::IError::SEVERITY_ERROR_NONCRITICAL);
- std::cout << "Sax FWL Error: " <<
saxFWLError->getErrorMessage() << std::endl;
+
+ isError = (saxFWLError->getSeverity() !=
COLLADASaxFWL::IError::SEVERITY_ERROR_NONCRITICAL);
+
}
else {
- std::cout << "opencollada error: " <<
error->getFullErrorMessage() << std::endl;
+ error_context = "OpenCollada";
+ error_message = error->getFullErrorMessage();
+ isError = true;
}
- return isWarning;
+ std::string severity = (isError) ? "Error" : "Warning";
+ std::cout << error_context << " (" << severity << "): " <<
error_message << std::endl;
+ if (isError) {
+ std::cout << "The Collada import has been forced to stop." <<
std::endl;
+ std::cout << "Please fix the reported error and then try
again.";
+ mError = true;
+ }
+ return isError;
}
diff --git a/source/blender/editors/io/io_collada.c
b/source/blender/editors/io/io_collada.c
index dfcc3a8d8c3..288f3b24fcd 100644
--- a/source/blender/editors/io/io_collada.c
+++ b/source/blender/editors/io/io_collada.c
@@ -606,7 +606,7 @@ static int wm_collada_import_exec(bContext *C, wmOperator
*op)
return OPERATOR_FINISHED;
}
else {
- BKE_report(op->reports, RPT_ERROR, "Errors found during parsing
COLLADA document (see console for details)");
+ BKE_report(op->reports, RPT_ERROR, "Parsing errors in Document
(see Blender Console)");
return OPERATOR_CANCELLED;
}
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
