sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed some warnings

Browse Source 
Former-commit-id: d7db2b471afac2d16f44a67e79842f8a7fc2100e
This commit is contained in:
Lynix
2015-06-28 13:48:22 +02:00
parent 8648258ef7
commit 318da0d960
8 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Nazara/Utility/Formats/OBJParser.cpp
View File

@@ -104,12 +104,12 @@ bool NzOBJParser::Parse()
std::unordered_map<NzString, std::unordered_map<NzString, MatPair>> meshes;
unsigned int matIndex = 0;
auto GetMaterial = [&meshes, &matIndex] (const NzString& meshName, const NzString& matName) -> FaceVec*
auto GetMaterial = [&meshes, &matIndex] (const NzString& mesh, const NzString& material) -> FaceVec*
{
auto& map = meshes[meshName];
auto it = map.find(matName);
auto& map = meshes[mesh];
auto it = map.find(material);
if (it == map.end())
it = map.insert(std::make_pair(matName, MatPair(FaceVec(), matIndex++))).first;
it = map.insert(std::make_pair(material, MatPair(FaceVec(), matIndex++))).first;
return &(it->second.first);
};