Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FIX: Material files with blanks in the filename can be loaded.

Browse Source 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@169 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
This commit is contained in:
kimmi
2008-10-05 13:05:53 +00:00
parent 9eee308c4a
commit cb7d509017
4 changed files with 216 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
code/ObjFileParser.cpp
View File

@@ -44,10 +44,11 @@ ObjFileParser::ObjFileParser(std::vector<char> &Data,
// -------------------------------------------------------------------
ObjFileParser::~ObjFileParser()
{
// empty
if(m_pModel->m_pDefaultMaterial) delete m_pModel->m_pDefaultMaterial;
if(m_pModel) delete m_pModel;
delete m_pModel->m_pDefaultMaterial;
m_pModel->m_pDefaultMaterial = NULL;
delete m_pModel;
m_pModel = NULL;
}
// -------------------------------------------------------------------
@@ -395,7 +396,7 @@ void ObjFileParser::getMaterialLib()
return;
char *pStart = &(*m_DataIt);
while (!isSpace(*m_DataIt))
while (!isNewLine(*m_DataIt))
m_DataIt++;
// Check for existence