projects
/
platform
/
upstream
/
assimp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5cd16a0
)
Fix OBJ parser mtllib statement parsing bug.
author
John Senneker
<johns@matterandform.net>
Mon, 17 Oct 2016 22:48:04 +0000
(18:48 -0400)
committer
John Senneker
<johns@matterandform.net>
Mon, 17 Oct 2016 22:48:04 +0000
(18:48 -0400)
Since `getName` returns the whole line (including spaces) parse out the
first word for comparison.
code/ObjFileParser.cpp
patch
|
blob
|
history
diff --git
a/code/ObjFileParser.cpp
b/code/ObjFileParser.cpp
index
9b13eea
..
7859563
100644
(file)
--- a/
code/ObjFileParser.cpp
+++ b/
code/ObjFileParser.cpp
@@
-182,9
+182,10
@@
void ObjFileParser::parseFile()
case 'm': // Parse a material library or merging group ('mg')
{
-
std::string name;
+ std::string name;
- getName(m_DataIt, m_DataItEnd, name);
+ getName(m_DataIt, m_DataItEnd, name);
+ name = name.substr(0, name.find(" "));
if (name == "mg")
getGroupNumberAndResolution();
else if(name == "mtllib")