From 077511b1a0532e7f3d985507ecb8b5fe470a62b4 Mon Sep 17 00:00:00 2001 From: aramis_acg Date: Sat, 9 May 2009 23:54:16 +0000 Subject: [PATCH] FIX: WaveFront MTL files will no line break at the end will now read properly. Manually removing the line break from a test file for regression testing. git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@418 67173fc5-114c-0410-ac8e-9d2fd5bffc1f --- code/ObjFileMtlImporter.cpp | 5 +---- test/models/OBJ/spider.mtl | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/code/ObjFileMtlImporter.cpp b/code/ObjFileMtlImporter.cpp index f979ce18d..bca10076c 100644 --- a/code/ObjFileMtlImporter.cpp +++ b/code/ObjFileMtlImporter.cpp @@ -284,10 +284,7 @@ void ObjFileMtlImporter::getTexture() } std::string strTexture; - m_DataIt = getName( m_DataIt, m_DataItEnd, strTexture ); - if ( m_DataItEnd == m_DataIt ) - return; - + getName( m_DataIt, m_DataItEnd, strTexture ); out->Set( strTexture ); } diff --git a/test/models/OBJ/spider.mtl b/test/models/OBJ/spider.mtl index f9deffa8e..38207dcc6 100644 --- a/test/models/OBJ/spider.mtl +++ b/test/models/OBJ/spider.mtl @@ -35,4 +35,4 @@ Ka 0.200000 0.200000 0.200000 Kd 0.800000 0.800000 0.800000 Ks 0.000000 0.000000 0.000000 Ns 0.000000 -map_Kd .\engineflare1.jpg +map_Kd .\engineflare1.jpg \ No newline at end of file