From 6891db99af139b1937358f5d3de1d0ff27b3b59d Mon Sep 17 00:00:00 2001
From: Vitaly Kovalev <vkovalev@gkmsoft.ru>
Date: Tue, 27 Jun 2017 13:52:43 +0300
Subject: [PATCH] Fixed texture bug due simultaneously using 'usemtl' and
 'usemap' attributes

Signed-off-by: Vitaly Kovalev <vkovalev@gkmsoft.ru>
---
 code/ObjFileParser.cpp | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/code/ObjFileParser.cpp b/code/ObjFileParser.cpp
index bd73a88d9..dfa77dba2 100644
--- a/code/ObjFileParser.cpp
+++ b/code/ObjFileParser.cpp
@@ -179,7 +179,18 @@ void ObjFileParser::parseFile( IOStreamBuffer<char> &streamBuffer ) {
 
         case 'u': // Parse a material desc. setter
             {
-                getMaterialDesc();
+                std::string name;
+
+                getNameNoSpace(m_DataIt, m_DataItEnd, name);
+
+                size_t nextSpace = name.find(" ");
+                if (nextSpace != std::string::npos)
+                    name = name.substr(0, nextSpace);
+
+                if(name == "usemtl")
+                {
+                    getMaterialDesc();
+                }
             }
             break;