Pixyco-XYZ/openmesh
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Fixed OBJ reader not reading materials which start with a leading space"

Browse Source 
This reverts commit f5e5aa83b1.
This commit is contained in:
Jan Möbius
2021-09-24 12:55:54 +02:00
parent f5e5aa83b1
commit fad00c8eb9
4 changed files with 5 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/OpenMesh/Core/IO/reader/OBJReader.cc
View File

@@ -188,24 +188,23 @@ read_material(std::fstream& _in)
stream >> keyWrd;
if (keyWrd == "newmtl") // begin new material definition
if( ( isspace(line[0]) && line[0] != '\t' ) || line[0] == '#' )
{
// If we are in a material definition (Already reading a material)
// And a material name has been set
// And the current material definition is valid
// Then Store the current material in our lookup table
if (indef && !key.empty() && mat.is_valid())
{
materials_[key] = mat;
mat.cleanup();
}
}
else if (keyWrd == "newmtl") // begin new material definition
{
stream >> key;
indef = true;
}
else if (keyWrd == "Kd") // diffuse color
{
{
stream >> f1; stream >> f2; stream >> f3;
if( !stream.fail() )