Merge branch 'master' of git://github.com/assimp/assimp

This commit is contained in:
Alexander Gessler
2012-12-21 16:24:05 +01:00
179 changed files with 20711 additions and 7693 deletions

View File

@@ -44,6 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "AssimpPCH.h"
#ifndef ASSIMP_BUILD_NO_LWS_IMPORTER
#include "LWSLoader.h"
#include "ParsingUtils.h"
@@ -918,3 +919,5 @@ void LWSImporter::InternReadFile( const std::string& pFile, aiScene* pScene,
}
}
#endif // !! ASSIMP_BUILD_NO_LWS_IMPORTER