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/LWSLoader.cpp
+++ b/code/LWSLoader.cpp
@@ -241,7 +241,7 @@ void LWSImporter::ReadEnvelope_Old(
 	std::list< LWS::Element >::const_iterator& it, 
 	const std::list< LWS::Element >::const_iterator& end,
 	LWS::NodeDesc& nodes,
-	unsigned int version)
+	unsigned int /*version*/)
 {
 	unsigned int num,sub_num;
 	if (++it == end)goto unexpected_end;