From 2acde008a9a334b945e32bb1a732054d0d1f4bd0 Mon Sep 17 00:00:00 2001 From: ulfjorensen Date: Sat, 6 Mar 2010 10:31:37 +0000 Subject: [PATCH] - fixed docs concerning Importer::ReadFile() after a hint in the forum. git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@588 67173fc5-114c-0410-ac8e-9d2fd5bffc1f --- doc/dox.h | 3 ++- include/assimp.hpp | 5 ++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/dox.h b/doc/dox.h index 714f16dd6..cec7aa90b 100644 --- a/doc/dox.h +++ b/doc/dox.h @@ -21,7 +21,7 @@ some file formats contain data not supported by ASSIMP, some stuff would require that it has not yet been implemented, and some formats have not completely been documented by their inventors):

-Collada ( *.dae;*.xml ) 3
+Collada ( *.dae;*.xml )
Biovision BVH ( *.bvh )
3D Studio Max 3DS ( *.3ds )
3D Studio Max ASE ( *.ase )
@@ -51,6 +51,7 @@ that it has not yet been implemented, and some formats have not completely been 3D GameStudio Model ( *.mdl )
3D GameStudio Terrain ( *.hmp )
Ogre (.mesh.xml, .skeleton.xml, .material)

+Milkshape 3D files ( *.ms3d )
 See the @link importer_notes Importer Notes Page @endlink for informations, what a specific importer can do and what not.
diff --git a/include/assimp.hpp b/include/assimp.hpp index 959f7728f..e8c293cda 100644 --- a/include/assimp.hpp +++ b/include/assimp.hpp @@ -326,8 +326,7 @@ public: * instance. Use GetOrphanedScene() to take ownership of it. * * @note Assimp is able to determine the file format of a file - * automatically. However, to enable automatic detection of the file - * format, the input path *must* not have an extension at all. + * automatically. */ const aiScene* ReadFile( const char* pFile, @@ -366,7 +365,7 @@ public: * buffers, but it doesn't handle model formats spreading their * data across multiple files or even directories. Examples include * OBJ or MD3, which outsource parts of their material stuff into - * external scripts. f you need the full functionality, provide + * external scripts. If you need the full functionality, provide * a custom IOSystem to make Assimp find these files. */ const aiScene* ReadFileFromMemory(