1 files changed, 32 insertions, 13 deletions

diff --git a/source/blender/collada/ErrorHandler.cpp b/source/blender/collada/ErrorHandler.cpp
index caa73900632..d567127879c 100644
--- a/source/blender/collada/ErrorHandler.cpp
+++ b/source/blender/collada/ErrorHandler.cpp
@@ -49,47 +49,66 @@ 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) {
+
+		else 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;
+		else if (parserError.getErrorType() == GeneratedSaxParser::ParserError::ERROR_COULD_NOT_OPEN_FILE) {
+			isError = true;
+			error_context = "File access";
 		}
 
-		std::cout << "Schema validation error: " << parserError.getErrorMessage() << std::endl;
+		else isError = (parserError.getSeverity() != COLLADASaxFWL::IError::SEVERITY_ERROR_NONCRITICAL);
 	}
 	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;
 }