From 6c78f181b5d2931baeae328af625f03dc9bec0c1 Mon Sep 17 00:00:00 2001
From: hecks <42101236+hecktest@users.noreply.github.com>
Date: Thu, 29 Jul 2021 05:05:34 +0200
Subject: [PATCH] Fix .x material slot parsing

Co-authored-by: hecktest <>
---
 source/Irrlicht/CXMeshFileLoader.cpp | 17 +++++++++++++----
 source/Irrlicht/CXMeshFileLoader.h   |  8 --------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/source/Irrlicht/CXMeshFileLoader.cpp b/source/Irrlicht/CXMeshFileLoader.cpp
index 547a5129..27c4e369 100644
--- a/source/Irrlicht/CXMeshFileLoader.cpp
+++ b/source/Irrlicht/CXMeshFileLoader.cpp
@@ -89,7 +89,6 @@ IAnimatedMesh* CXMeshFileLoader::createMesh(io::IReadFile* file)
 	P=0;
 	End=0;
 	CurFrame=0;
-	TemplateMaterials.clear();
 
 	delete [] Buffer;
 	Buffer = 0;
@@ -519,6 +518,11 @@ bool CXMeshFileLoader::parseDataObject()
 		return parseDataObjectAnimationTicksPerSecond();
 	}
 	else
+	if (objectName == "Material")
+	{
+		return parseUnknownDataObject();
+	}
+	else
 	if (objectName == "}")
 	{
 		os::Printer::log("} found in dataObject", ELL_WARNING);
@@ -1455,12 +1459,17 @@ bool CXMeshFileLoader::parseDataObjectMeshMaterialList(SXMesh &mesh)
 		{
 			// template materials now available thanks to joeWright
 			objectName = getNextToken();
-			for (u32 i=0; i<TemplateMaterials.size(); ++i)
-				if (TemplateMaterials[i].Name == objectName)
-					mesh.Materials.push_back(TemplateMaterials[i].Material);
+			mesh.Materials.push_back(video::SMaterial());
 			getNextToken(); // skip }
 		}
 		else
+		if (objectName == "Material")
+		{
+			mesh.Materials.push_back(video::SMaterial());
+			if (!parseUnknownDataObject())
+				return false;
+		}
+		else
 		if (objectName == ";")
 		{
 			// ignore
diff --git a/source/Irrlicht/CXMeshFileLoader.h b/source/Irrlicht/CXMeshFileLoader.h
index 41fab00d..a517f55e 100644
--- a/source/Irrlicht/CXMeshFileLoader.h
+++ b/source/Irrlicht/CXMeshFileLoader.h
@@ -39,12 +39,6 @@ public:
 	//! See IReferenceCounted::drop() for more information.
 	virtual IAnimatedMesh* createMesh(io::IReadFile* file) _IRR_OVERRIDE_;
 
-	struct SXTemplateMaterial
-	{
-		core::stringc Name; // template name from Xfile
-		video::SMaterial Material; // material
-	};
-
 	struct SXMesh
 	{
 		SXMesh() : MaxSkinWeightsPerVertex(0), MaxSkinWeightsPerFace(0), BoneCount(0),AttachedJointID(-1),HasSkinning(false), HasVertexColors(false) {}
@@ -182,8 +176,6 @@ private:
 
 	core::array<SXMesh*> Meshes;
 
-	core::array<SXTemplateMaterial> TemplateMaterials;
-
 	u32 MajorVersion;
 	u32 MinorVersion;
 	bool BinaryFormat;