BTH/escape-the-dawn
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn

Browse Source 
Conflicts:
	Escape-the-Dawn/plane.obj
This commit is contained in:
ViktorLjung
2014-03-12 22:42:59 +01:00
parent 56ccc31e57 fef9c1f751
commit ec25625b0a
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Escape-the-Dawn/OBJ.cpp
+3 -1
View File
@@ -218,7 +218,9 @@ void OBJ::ParseMaterial()
// Texture file // Texture file
// TODO: // TODO:
if (prefix == "map_Ka" || prefix == "map_Kd") { if (prefix == "map_Ka" || prefix == "map_Kd") {
ss >> currentMaterial->TextureFile; std::string textureFile;
ss >> textureFile;
currentMaterial->TextureFile = (m_MaterialPath.branch_path() / textureFile).string();
continue; continue;
} }
} }