From 1d7eea602c98af3b4972bc72571d93847f57d81c Mon Sep 17 00:00:00 2001
From: bitplane <bitplane@dfc29bdd-3216-0410-991c-e03cc46cb475>
Date: Sun, 9 Sep 2007 08:39:21 +0000
Subject: [PATCH] updated vc8 project. fixed two small x loader bugs

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@932 dfc29bdd-3216-0410-991c-e03cc46cb475
---
 source/Irrlicht/CXMeshFileLoader.cpp |  5 +++--
 source/Irrlicht/Irrlicht8.0.vcproj   | 32 ++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/source/Irrlicht/CXMeshFileLoader.cpp b/source/Irrlicht/CXMeshFileLoader.cpp
index 06cd1576..7782818a 100644
--- a/source/Irrlicht/CXMeshFileLoader.cpp
+++ b/source/Irrlicht/CXMeshFileLoader.cpp
@@ -557,7 +557,8 @@ bool CXMeshFileLoader::parseDataObjectFrame( CSkinnedMesh::SJoint *Parent )
 
 			Meshes.push_back(mesh);
 
-			return parseDataObjectMesh ( *mesh );
+			if (!parseDataObjectMesh(*mesh))
+				return false;
 		}
 		else
 		{
@@ -1145,7 +1146,7 @@ bool CXMeshFileLoader::parseDataObjectMeshVertexColors(SXMesh &mesh)
 	}
 
 	core::stringc tmp=getNextToken();
-	if (tmp != ";")
+	if (tmp != ";" && tmp != ";;")
 	{
 		os::Printer::log("No finishing semicolon in Mesh Vertex Colors Array found in x file", ELL_WARNING);
 		return false;
diff --git a/source/Irrlicht/Irrlicht8.0.vcproj b/source/Irrlicht/Irrlicht8.0.vcproj
index 110f39d0..fdf664b9 100644
--- a/source/Irrlicht/Irrlicht8.0.vcproj
+++ b/source/Irrlicht/Irrlicht8.0.vcproj
@@ -663,6 +663,10 @@
 					RelativePath=".\..\..\include\IMeshSceneNode.h"
 					>
 				</File>
+				<File
+					RelativePath="..\..\include\IMeshWriter.h"
+					>
+				</File>
 				<File
 					RelativePath=".\..\..\include\IMetaTriangleSelector.h"
 					>
@@ -1747,6 +1751,14 @@
 					RelativePath=".\CDMFLoader.h"
 					>
 				</File>
+				<File
+					RelativePath=".\CIrrMeshFileLoader.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\CIrrMeshFileLoader.h"
+					>
+				</File>
 				<File
 					RelativePath=".\CLMTSMeshFileLoader.cpp"
 					>
@@ -2168,6 +2180,26 @@
 					>
 				</File>
 			</Filter>
+			<Filter
+				Name="writers"
+				>
+				<File
+					RelativePath=".\CColladaMeshWriter.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\CColladaMeshWriter.h"
+					>
+				</File>
+				<File
+					RelativePath=".\CIrrMeshWriter.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\CIrrMeshWriter.h"
+					>
+				</File>
+			</Filter>
 		</Filter>
 		<Filter
 			Name="io impl"