diff --git a/port/Assimp.NET/Assimp.NET.sln b/port/Assimp.NET/Assimp.NET.sln
index d610effbc..776877a7e 100644
--- a/port/Assimp.NET/Assimp.NET.sln
+++ b/port/Assimp.NET/Assimp.NET.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 10.00
# Visual Studio 2008
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Assimp.NET", "Assimp.NET\Assimp.NET.vcproj", "{A86A8AF2-3B4D-4381-BB01-9CA2AE88450E}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assimp.NET_CS", "Assimp.NET_CS\Assimp.NET_CS.csproj", "{398AA9C3-5C12-4C51-84A3-32D563618F57}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assimp.NET_CS", "Assimp.NET_CS\Assimp.NET_CS.csproj", "{A0CE9ED2-A27E-40AE-95F5-FEF94BB7E131}"
ProjectSection(ProjectDependencies) = postProject
{A86A8AF2-3B4D-4381-BB01-9CA2AE88450E} = {A86A8AF2-3B4D-4381-BB01-9CA2AE88450E}
EndProjectSection
@@ -28,16 +28,16 @@ Global
{A86A8AF2-3B4D-4381-BB01-9CA2AE88450E}.Release|Mixed Platforms.Build.0 = Release|Win32
{A86A8AF2-3B4D-4381-BB01-9CA2AE88450E}.Release|Win32.ActiveCfg = Release|Win32
{A86A8AF2-3B4D-4381-BB01-9CA2AE88450E}.Release|Win32.Build.0 = Release|Win32
- {398AA9C3-5C12-4C51-84A3-32D563618F57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {398AA9C3-5C12-4C51-84A3-32D563618F57}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {398AA9C3-5C12-4C51-84A3-32D563618F57}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
- {398AA9C3-5C12-4C51-84A3-32D563618F57}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
- {398AA9C3-5C12-4C51-84A3-32D563618F57}.Debug|Win32.ActiveCfg = Debug|Any CPU
- {398AA9C3-5C12-4C51-84A3-32D563618F57}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {398AA9C3-5C12-4C51-84A3-32D563618F57}.Release|Any CPU.Build.0 = Release|Any CPU
- {398AA9C3-5C12-4C51-84A3-32D563618F57}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
- {398AA9C3-5C12-4C51-84A3-32D563618F57}.Release|Mixed Platforms.Build.0 = Release|Any CPU
- {398AA9C3-5C12-4C51-84A3-32D563618F57}.Release|Win32.ActiveCfg = Release|Any CPU
+ {A0CE9ED2-A27E-40AE-95F5-FEF94BB7E131}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {A0CE9ED2-A27E-40AE-95F5-FEF94BB7E131}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {A0CE9ED2-A27E-40AE-95F5-FEF94BB7E131}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {A0CE9ED2-A27E-40AE-95F5-FEF94BB7E131}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {A0CE9ED2-A27E-40AE-95F5-FEF94BB7E131}.Debug|Win32.ActiveCfg = Debug|Any CPU
+ {A0CE9ED2-A27E-40AE-95F5-FEF94BB7E131}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {A0CE9ED2-A27E-40AE-95F5-FEF94BB7E131}.Release|Any CPU.Build.0 = Release|Any CPU
+ {A0CE9ED2-A27E-40AE-95F5-FEF94BB7E131}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {A0CE9ED2-A27E-40AE-95F5-FEF94BB7E131}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {A0CE9ED2-A27E-40AE-95F5-FEF94BB7E131}.Release|Win32.ActiveCfg = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/port/Assimp.NET/Assimp.NET/AssimpSwigPort.i b/port/Assimp.NET/Assimp.NET/AssimpSwigPort.i
index f07c7e3e1..0ff50f812 100644
--- a/port/Assimp.NET/Assimp.NET/AssimpSwigPort.i
+++ b/port/Assimp.NET/Assimp.NET/AssimpSwigPort.i
@@ -15,7 +15,7 @@
#include "..\..\..\include\aiLight.h"
#include "..\..\..\include\aiAnim.h"
#include "..\..\..\include\aiMesh.h"
-//#include "..\..\..\include\aiFileIO.h"
+#include "..\..\..\include\aiFileIO.h"
#include "..\..\..\include\aiMaterial.h"
#include "..\..\..\include\aiQuaternion.h"
#include "..\..\..\include\aiScene.h"
@@ -25,7 +25,7 @@
#include "..\..\..\include\IOStream.h"
#include "..\..\..\include\Logger.h"
#include "..\..\..\include\LogStream.h"
-//#include "..\..\..\include\NullLogger.h"
+#include "..\..\..\include\NullLogger.h"
%}
#define C_STRUCT
@@ -66,7 +66,7 @@
%include "..\..\..\include\aiLight.h"
%include "..\..\..\include\aiAnim.h"
%include "..\..\..\include\aiMesh.h"
-//%include "..\..\..\include\aiFileIO.h"
+%include "..\..\..\include\aiFileIO.h"
%include "..\..\..\include\aiMaterial.h"
%include "..\..\..\include\aiQuaternion.h"
%include "..\..\..\include\aiScene.h"
@@ -76,7 +76,7 @@
%include "..\..\..\include\IOStream.h"
%include "..\..\..\include\Logger.h"
%include "..\..\..\include\LogStream.h"
-//%include "..\..\..\include\NullLogger.h"
+%include "..\..\..\include\NullLogger.h"
diff --git a/port/Assimp.NET/Assimp.NET_CS/Assimp.NET_CS.csproj b/port/Assimp.NET/Assimp.NET_CS/Assimp.NET_CS.csproj
index 7ee7d3549..06adc5a46 100644
--- a/port/Assimp.NET/Assimp.NET_CS/Assimp.NET_CS.csproj
+++ b/port/Assimp.NET/Assimp.NET_CS/Assimp.NET_CS.csproj
@@ -17,7 +17,7 @@
true
full
false
- ..\port_bin\
+ ..\..\..\bin\%24%28ProjectName%29_%24%28ConfigurationName%29_%24%28PlatformName%29\
DEBUG;TRACE
prompt
4
diff --git a/port/Assimp.NET/Assimp.NET_CS/SWIGTYPE_p_aiFileIO.cs b/port/Assimp.NET/Assimp.NET_CS/SWIGTYPE_p_aiFileIO.cs
new file mode 100644
index 000000000..ae9be43c3
--- /dev/null
+++ b/port/Assimp.NET/Assimp.NET_CS/SWIGTYPE_p_aiFileIO.cs
@@ -0,0 +1,27 @@
+/* ----------------------------------------------------------------------------
+ * This file was automatically generated by SWIG (http://www.swig.org).
+ * Version 1.3.40
+ *
+ * Do not make changes to this file unless you know what you are doing--modify
+ * the SWIG interface file instead.
+ * ----------------------------------------------------------------------------- */
+
+
+using System;
+using System.Runtime.InteropServices;
+
+public class SWIGTYPE_p_aiFileIO {
+ private HandleRef swigCPtr;
+
+ internal SWIGTYPE_p_aiFileIO(IntPtr cPtr, bool futureUse) {
+ swigCPtr = new HandleRef(this, cPtr);
+ }
+
+ protected SWIGTYPE_p_aiFileIO() {
+ swigCPtr = new HandleRef(null, IntPtr.Zero);
+ }
+
+ internal static HandleRef getCPtr(SWIGTYPE_p_aiFileIO obj) {
+ return (obj == null) ? new HandleRef(null, IntPtr.Zero) : obj.swigCPtr;
+ }
+}
diff --git a/port/Assimp.NET/Assimp.NET_CS/obj/Debug/Assimp.NET_CS.csproj.FileListAbsolute.txt b/port/Assimp.NET/Assimp.NET_CS/obj/Debug/Assimp.NET_CS.csproj.FileListAbsolute.txt
index a255e5136..e30dda103 100644
--- a/port/Assimp.NET/Assimp.NET_CS/obj/Debug/Assimp.NET_CS.csproj.FileListAbsolute.txt
+++ b/port/Assimp.NET/Assimp.NET_CS/obj/Debug/Assimp.NET_CS.csproj.FileListAbsolute.txt
@@ -3,3 +3,5 @@ D:\Projekte\Assimp\trunk\port\Assimp.NET\port_bin\Assimp.NET_CS.pdb
D:\Projekte\Assimp\trunk\port\Assimp.NET\Assimp.NET_CS\obj\Debug\ResolveAssemblyReference.cache
D:\Projekte\Assimp\trunk\port\Assimp.NET\Assimp.NET_CS\obj\Debug\Assimp.NET_CS.dll
D:\Projekte\Assimp\trunk\port\Assimp.NET\Assimp.NET_CS\obj\Debug\Assimp.NET_CS.pdb
+D:\Projekte\Assimp\trunk\bin\$(ProjectName)_$(ConfigurationName)_$(PlatformName)\Assimp.NET_CS.dll
+D:\Projekte\Assimp\trunk\bin\$(ProjectName)_$(ConfigurationName)_$(PlatformName)\Assimp.NET_CS.pdb
diff --git a/port/Assimp.NET/Assimp.NET_CS/obj/Debug/Assimp.NET_CS.dll b/port/Assimp.NET/Assimp.NET_CS/obj/Debug/Assimp.NET_CS.dll
index 1c4356ccf..0cf285aad 100644
Binary files a/port/Assimp.NET/Assimp.NET_CS/obj/Debug/Assimp.NET_CS.dll and b/port/Assimp.NET/Assimp.NET_CS/obj/Debug/Assimp.NET_CS.dll differ
diff --git a/port/Assimp.NET/Assimp.NET_CS/obj/Debug/Assimp.NET_CS.pdb b/port/Assimp.NET/Assimp.NET_CS/obj/Debug/Assimp.NET_CS.pdb
index f4c1faa7d..dd39b5716 100644
Binary files a/port/Assimp.NET/Assimp.NET_CS/obj/Debug/Assimp.NET_CS.pdb and b/port/Assimp.NET/Assimp.NET_CS/obj/Debug/Assimp.NET_CS.pdb differ
diff --git a/port/Assimp.NET/Assimp.NET_CS/obj/Debug/ResolveAssemblyReference.cache b/port/Assimp.NET/Assimp.NET_CS/obj/Debug/ResolveAssemblyReference.cache
index 64d68966f..85e4bb9af 100644
Binary files a/port/Assimp.NET/Assimp.NET_CS/obj/Debug/ResolveAssemblyReference.cache and b/port/Assimp.NET/Assimp.NET_CS/obj/Debug/ResolveAssemblyReference.cache differ