[Bf-blender-cvs] [89060babbcd] master: Collada: improved Error handling: Avoid shutdown of Blender when the Collada importer finds Syntax errors in import data

[Gaia Clary]

Commit: 89060babbcd6099e0d53cf0164661d11a79369bd
Author: Gaia Clary
Date:   Sat Jun 24 21:50:04 2017 +0200
Branches: master
https://developer.blender.org/rB89060babbcd6099e0d53cf0164661d11a79369bd

Collada: improved Error handling: Avoid shutdown of Blender when the Collada importer finds Syntax errors in import data

===================================================================

M	source/blender/collada/ErrorHandler.cpp

===================================================================

diff --git a/source/blender/collada/ErrorHandler.cpp b/source/blender/collada/ErrorHandler.cpp
index 98aa85f8a9b..32aa5636e08 100644
--- a/source/blender/collada/ErrorHandler.cpp
+++ b/source/blender/collada/ErrorHandler.cpp
@@ -49,7 +49,7 @@ ErrorHandler::~ErrorHandler()
 //--------------------------------------------------------------------
 bool ErrorHandler::handleError(const COLLADASaxFWL::IError *error)
 {
-	bool isError = true;
+	bool isError = false;
 	
 	if (error->getErrorClass() == COLLADASaxFWL::IError::ERROR_SAXPARSER) {
 		COLLADASaxFWL::SaxParserError *saxParserError = (COLLADASaxFWL::SaxParserError *) error;
@@ -81,10 +81,7 @@ bool ErrorHandler::handleError(const COLLADASaxFWL::IError *error)
 		 * Accept non critical errors as warnings (i.e. texture not found)
 		 * This makes the importer more graceful, so it now imports what makes sense.
 		 */
-		if (saxFWLError->getSeverity() == COLLADASaxFWL::IError::SEVERITY_ERROR_NONCRITICAL) {
-			isError = false;
-		}
-
+		isError = (saxFWLError->getSeverity() != COLLADASaxFWL::IError::SEVERITY_ERROR_NONCRITICAL);
 		std::cout << "Sax FWL Error: " << saxFWLError->getErrorMessage() << std::endl;
 	}
 	else {
@@ -93,5 +90,5 @@ bool ErrorHandler::handleError(const COLLADASaxFWL::IError *error)
 
 	mError |= isError;
 
-	return false; // let OpenCollada decide when to abort
+	return isError; // let OpenCollada decide when to abort
 }