merge with git://github.com/tonttu/assimp.git

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1029 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-06-09 14:29:32 +00:00
parent 2de55ee880
commit 9edc0a9b8e
56 changed files with 178 additions and 130 deletions
--- a/code/BlenderDNA.cpp
+++ b/code/BlenderDNA.cpp
@@ -288,7 +288,7 @@ boost::shared_ptr< ElemBase > DNA :: ConvertBlobToStructure(
 // ------------------------------------------------------------------------------------------------
 DNA::FactoryPair DNA :: GetBlobToStructureConverter(
 	const Structure& structure,
-	const FileDatabase& db
+	const FileDatabase& /*db*/
 ) const 
 {
 	std::map<std::string,  FactoryPair>::const_iterator it = converters.find(structure.name);