fixed obj loader not hashing material index correctly
This commit is contained in:
@@ -2901,8 +2901,9 @@ void Model::LoadFromDisk(const std::string& fileName, const std::string& identif
|
||||
hash<int>{}(index.vertex_index),
|
||||
hash<int>{}(index.normal_index),
|
||||
hash<int>{}(index.texcoord_index),
|
||||
hash<int>{}(materialIndex),
|
||||
};
|
||||
size_t vertexHash = (hashes[0] ^ (hashes[1] << 1) >> 1) ^ (hashes[2] << 1);
|
||||
size_t vertexHash = (((hashes[0] ^ (hashes[1] << 1) >> 1) ^ (hashes[2] << 1)) >> 1) ^ (hashes[3] << 1);
|
||||
|
||||
if (uniqueVertices.count(vertexHash) == 0)
|
||||
{
|
||||
|
||||
@@ -9,7 +9,7 @@ namespace wiVersion
|
||||
// minor features, major updates
|
||||
const int minor = 16;
|
||||
// minor bug fixes, alterations, refactors, updates
|
||||
const int revision = 36;
|
||||
const int revision = 37;
|
||||
|
||||
|
||||
long GetVersion()
|
||||
|
||||
Reference in New Issue
Block a user