diff --git a/doc/AssimpCmdDoc_Html/AssimpCmdDoc.chm b/doc/AssimpCmdDoc_Html/AssimpCmdDoc.chm
index f07beccd4..c81fa6e53 100644
Binary files a/doc/AssimpCmdDoc_Html/AssimpCmdDoc.chm and b/doc/AssimpCmdDoc_Html/AssimpCmdDoc.chm differ
diff --git a/doc/AssimpDoc_Html/AssimpDoc.chm b/doc/AssimpDoc_Html/AssimpDoc.chm
index f228f04e7..063db611e 100644
Binary files a/doc/AssimpDoc_Html/AssimpDoc.chm and b/doc/AssimpDoc_Html/AssimpDoc.chm differ
diff --git a/doc/Doxyfile b/doc/Doxyfile
index ba5bd2d93..9f723576e 100644
--- a/doc/Doxyfile
+++ b/doc/Doxyfile
@@ -5,7 +5,7 @@
#---------------------------------------------------------------------------
DOXYFILE_ENCODING = UTF-8
PROJECT_NAME = Assimp
-PROJECT_NUMBER = "v1.1 (April 2010)"
+PROJECT_NUMBER = "v2.0 (November 2010)"
OUTPUT_DIRECTORY =
CREATE_SUBDIRS = NO
OUTPUT_LANGUAGE = English
diff --git a/doc/Doxyfile_Cmd b/doc/Doxyfile_Cmd
index 703d915cf..237ec3674 100644
--- a/doc/Doxyfile_Cmd
+++ b/doc/Doxyfile_Cmd
@@ -5,7 +5,7 @@
#---------------------------------------------------------------------------
DOXYFILE_ENCODING = UTF-8
PROJECT_NAME = Assimp Command Line Tools
-PROJECT_NUMBER = "v1.1 (April 2010)"
+PROJECT_NUMBER = "v2.0 (November 2010)"
OUTPUT_DIRECTORY =
CREATE_SUBDIRS = NO
OUTPUT_LANGUAGE = English
diff --git a/doc/dox.h b/doc/dox.h
index 05e8ce501..57c833fd0 100644
--- a/doc/dox.h
+++ b/doc/dox.h
@@ -22,6 +22,7 @@ that it has not been implemented yet and some (most ...) formats lack proper spe
Collada ( *.dae;*.xml )
+Blender ( *.blend ) 3
Biovision BVH ( *.bvh )
3D Studio Max 3DS ( *.3ds )
3D Studio Max ASE ( *.ase )
@@ -34,6 +35,7 @@ that it has not been implemented yet and some (most ...) formats lack proper spe
Quake I ( *.mdl )
Quake II ( *.md2 )
Quake III ( *.md3 )
+Quake 3 BSP ( *.pk3 ) 1
RtCW ( *.mdc )
Doom 3 ( *.md5mesh;*.md5anim;*.md5camera )
DirectX X ( *.x ).
@@ -55,14 +57,16 @@ that it has not been implemented yet and some (most ...) formats lack proper spe
Modo Model ( *.lxo )
CharacterStudio Motion ( *.csm )
Stanford Ply ( *.ply )
-TrueSpace ( *.cob, *.scn )
+TrueSpace ( *.cob, *.scn )2
See the @link importer_notes Importer Notes Page @endlink for informations, what a specific importer can do and what not.
Note that although this paper claims to be the official documentation,
http://assimp.sourceforge.net/main_features_formats.html
is usually the most up-to-date list of file formats supported by the library.
-3: These formats support animations, but ASSIMP doesn't yet support them (or they're buggy)
+1: Experimental loaders
+2: Indicates very limited support - many of the format's features don't map to Assimp's data structures.
+3: These formats support animations, but ASSIMP doesn't yet support them (or they're buggy)
diff --git a/packaging/windows-innosetup/readme_installer.txt b/packaging/windows-innosetup/readme_installer.txt
index 4e944a3a6..397fae3dc 100644
--- a/packaging/windows-innosetup/readme_installer.txt
+++ b/packaging/windows-innosetup/readme_installer.txt
@@ -4,35 +4,13 @@ Open Asset Import Library (Assimp) SDK Installer
Release Notes
------------------------------------------------------------------------------------
+http://assimp.sf.net
-Known Bugs & Limitations
-========================
-
-
-Assimp
-
-- IRR, DXF, MOT, LWS support is limited
-
-(the following issues are most likely to be addressed in a near bugfix update to 1.1)
-
-- COB is pretty new on the list, test coverage is bad. Please give feedback.
-- Ogre XML loader fails to load animations properly.
-- ColladaLoader handles instanced nodes not entirely correct.
-
-
-Viewer
-
-- If you toggle all UI components quickly, the app gets confused.
-- For files more than one embedded texture, only the first is loaded.
-- Normals appear flipped from time to time when either of the normals-related menu items was hit.
-- Alpha-sorting is implemented, but still causes artifacts when models are moved quickly.
-- Several important texture file formats (such as GIF) are not supported.
-- HUD is blurred on the right side. ATI/AMD hardware only.
Troubleshooting
===============
-1. Missing d3dx9_42.dll?
+1. Missing d3dx9_(some-number).dll?
Install the latest DirectX runtime or grab the file from somewhere (that's evil but mostly fine).
2. Application configuration not correct / missing msvcr***.dll?
@@ -42,4 +20,4 @@ Reinstall Microsoft Visual C++ 2005 SP1 Redistributable (x86 or x64, depending o
Add it to PATH. That's not a bug, the installer does not alter the PATH.
4. Crashes immediately
-You CPU lacks SSE2 support. Build Assimp from scratch to suit your CPU, sorry.ut mostly fine).
+You CPU lacks SSE2 support. Build Assimp from scratch to suit your CPU, sorry.
diff --git a/packaging/windows-innosetup/readme_installer_vieweronly.txt b/packaging/windows-innosetup/readme_installer_vieweronly.txt
index 9bbc10013..c1ff3716a 100644
--- a/packaging/windows-innosetup/readme_installer_vieweronly.txt
+++ b/packaging/windows-innosetup/readme_installer_vieweronly.txt
@@ -4,14 +4,13 @@ Open Asset Import Library (Assimp) Viewer Installer
Release Notes
------------------------------------------------------------------------------------
+http://assimp.sf.net
Known Bugs & Limitations
========================
Viewer
-- If you toggle all UI components quickly, the app gets confused.
-- For files more than one embedded texture, only the first is loaded.
- Normals appear flipped from time to time when either of the normals-related menu items was hit.
- Alpha-sorting is implemented, but still causes artifacts when models are moved quickly.
- Several important texture file formats (such as GIF) are not supported.
@@ -20,7 +19,7 @@ Viewer
Troubleshooting
===============
-1. Missing d3dx9_42.dll?
+1. Missing d3dx9_(number).dll?
Install the latest DirectX runtime or grab the file from somewhere (that's evil but mostly fine).
2. Application configuration not correct / missing msvcr***.dll?
diff --git a/packaging/windows-innosetup/script.iss b/packaging/windows-innosetup/script.iss
index ca60033ed..dc6082e12 100644
--- a/packaging/windows-innosetup/script.iss
+++ b/packaging/windows-innosetup/script.iss
@@ -2,7 +2,7 @@
[Setup]
AppName=Open Asset Import Library - SDK
-AppVerName=Open Asset Import Library - SDK (v1.1)
+AppVerName=Open Asset Import Library - SDK (v2.0)
DefaultDirName={pf}\Assimp
DefaultGroupName=Assimp
UninstallDisplayIcon={app}\bin\x86\assimp.exe
@@ -12,9 +12,9 @@ SetupIconFile=..\..\tools\shared\assimp_tools_icon.ico
WizardImageFile=compiler:WizModernImage-IS.BMP
WizardSmallImageFile=compiler:WizModernSmallImage-IS.BMP
LicenseFile=License.rtf
-OutputBaseFileName=assimp-sdk-1.1-setup
-VersionInfoVersion=1.1.0.0
-VersionInfoTextVersion=1.1
+OutputBaseFileName=assimp-sdk-2.0-setup
+VersionInfoVersion=2.0.0.0
+VersionInfoTextVersion=2.0
VersionInfoCompany=Assimp Development Team
ArchitecturesInstallIn64BitMode=x64
@@ -29,9 +29,11 @@ Name: "tools"; Description: "Asset Viewer & Command Line Tools (32 and 64 Bit)";
Name: "help"; Description: "Help Files"; Types: full compact
Name: "samples"; Description: "Samples"; Types: full
;Name: "wsource"; Description: "Source Code"; Types: full
-Name: "test"; Description: "Test Models"; Types: full
+Name: "test"; Description: "Test Models (BSD-licensed)"; Types: full
+Name: "test_nonbsd"; Description: "Test Models (other (free) licenses)"; Types: full
Name: "pyassimp"; Description: "Python Bindings"; Types: full
Name: "dassimp"; Description: "D Bindings"; Types: full
+Name: "assimp_net"; Description: "C#/.NET Bindings"; Types: full
;Name: "vc8"; Description: "VC8 project files"; Types: full
;Name: "vc9"; Description: "VC9 project files"; Types: full
@@ -86,6 +88,10 @@ Source: "..\..\include\*"; DestDir: "{app}\include"; Flags: recursesubdirs
; dAssimp
Source: "..\..\port\dAssimp\*"; DestDir: "{app}\port\D"; Flags: recursesubdirs; Components: dassimp
+Source: "..\..\port\swig\*"; DestDir: "{app}\port\D_SwigExperimental"; Flags: recursesubdirs; Components: dassimp
+
+; Assimp.NET
+Source: "..\..\port\Assimp.NET\*"; DestDir: "{app}\port\C#"; Flags: recursesubdirs; Components: assimp_net
; PyAssimp
Source: "..\..\port\PyAssimp\*"; DestDir: "{app}\port\Python"; Excludes: "*.pyc,*.dll"; Flags: recursesubdirs; Components: pyassimp
@@ -93,6 +99,7 @@ Source: "..\..\port\PyAssimp\*"; DestDir: "{app}\port\Python"; Excludes: "*.pyc,
; Test repository
Source: "..\..\test\models\*"; DestDir: "{app}\test\models"; Flags: recursesubdirs; Components: test
Source: "..\..\test\regression\*"; DestDir: "{app}\test\regression"; Flags: recursesubdirs; Components: test
+Source: "..\..\test\models-nonbsd\*"; DestDir: "{app}\test\models-nonbsd"; Flags: recursesubdirs; Components: test_nonbsd
; Source Code & Workspaces
;Source: "..\..\code\*"; Excludes: "*.o"; DestDir: "{app}\code"; Flags: recursesubdirs; Components: wsource
diff --git a/packaging/windows-mkzip/mkfinal.bat b/packaging/windows-mkzip/mkfinal.bat
index 39b5a8042..e4dc0c345 100644
--- a/packaging/windows-mkzip/mkfinal.bat
+++ b/packaging/windows-mkzip/mkfinal.bat
@@ -49,7 +49,7 @@ SET /p REVISIONBASE= < tmpfile.txt
DEL /q tmpfile.txt
cd ..\packaging\windows-mkzip
-SET VERSIONBASE=1.1.%REVISIONBASE%
+SET VERSIONBASE=2.0.%REVISIONBASE%
SET OUT_SDK=assimp--%VERSIONBASE%-sdk
SET OUT_BIN=assimp--%VERSIONBASE%-bin
@@ -99,7 +99,7 @@ rem We take the current revision and remove some stuff
rem that is nto yet ready to be published.
rem -----------------------------------------------------
-svn export .\..\..\ final\%OUT_SDK%
+svn export .\..\..\ .\final\%OUT_SDK%
mkdir final\%OUT_SDK%\doc\assimp_html
mkdir final\%OUT_SDK%\doc\assimpcmd_html
@@ -121,12 +121,6 @@ rem Insert 'dummy' files into empty folders
echo. > final\%OUT_SDK%\lib\dummy
echo. > final\%OUT_SDK%\obj\dummy
-rem Remove WIP ports and language bindings
-RD /s /q final\%OUT_SDK%\port\Assimp.NET
-RD /s /q final\%OUT_SDK%\port\jAssimp
-RD /s /q final\%OUT_SDK%\port\BrainFuckAssimp
-RD /s /q final\%OUT_SDK%\port\swig
-
rem Also, repackaging is not a must-have feature
RD /s /q final\%OUT_SDK%\packaging
diff --git a/revision.h b/revision.h
index 33c7bd7e8..5c5bf9c4f 100644
--- a/revision.h
+++ b/revision.h
@@ -1 +1 @@
-#define SVNRevision 805
+#define SVNRevision 842