Merge branch 'master' into 'master'

rip off light's missing SSA fix



See merge request !24

engine/shared/library/sharedObject/src/shared/appearance/AppearanceTemplateList.cpp

@@ -286,7 +286,7 @@ const AppearanceTemplate *AppearanceTemplateList::fetch(Iff *const iff)
 	{
 		char tagString[5];
 		ConvertTagToString(tag, tagString);
-		DEBUG_FATAL(true, ("AppearanceTemplate binding %s not found", tagString));
+		WARNING(true, ("AppearanceTemplate binding %s not found", tagString));
 		return 0; //lint !e527 // unreachable
 	}
 
@@ -399,6 +399,12 @@ Appearance *AppearanceTemplateList::createAppearance(const char *const fileName)
 	//-- creating the appearance will increment the reference count
 	Appearance *const appearance = appearanceTemplate->createAppearance();
 
+	// Return if we can't find the appearance file
+	if (appearanceTemplate == NULL) {
+		return NULL;
+	}
+
+
 #ifdef _DEBUG
 	DataLint::popAsset();
 #endif // _DEBUG
@@ -586,7 +592,7 @@ AppearanceTemplate *AppearanceTemplateListNamespace::create(const char *const fi
 		{
 			char tagString[5];
 			ConvertTagToString(tag, tagString);
-			DEBUG_FATAL(true, ("AppearanceTemplate binding %s not found for file %s", tagString, actualFileName.getString()));
+			WARNING(true, ("AppearanceTemplate binding %s not found for file %s", tagString, actualFileName.getString()));
 		}
 	}