mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-26 09:24:24 +02:00
Code Issues Projects Releases Wiki Activity

bugfix for join meshes, add opacity check also

Browse Source
This commit is contained in:
Mark Vejvoda
2013-06-22 22:41:37 +00:00
parent b418d46254
commit 9549b7f87a
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/shared_lib/sources/graphics/model.cpp
View File

@@ -1578,7 +1578,8 @@ void Model::autoJoinMeshFrames() {
mesh_key += string("_") + intToStr(mesh.getFrameCount()) + mesh_key += string("_") + intToStr(mesh.getFrameCount()) +
string("_") + intToStr(mesh.getTwoSided()) + string("_") + intToStr(mesh.getTwoSided()) +
string("_") + intToStr(mesh.getCustomTexture()) + string("_") + intToStr(mesh.getCustomTexture()) +
string("_") + intToStr(mesh.getNoSelect()); string("_") + intToStr(mesh.getNoSelect()) +
string("_") + floatToStr(mesh.getOpacity());
joinedMeshes[mesh_key].add(index,&mesh); joinedMeshes[mesh_key].add(index,&mesh);
if(haveJoinedMeshes == false && joinedMeshes[mesh_key].size() > 1) { if(haveJoinedMeshes == false && joinedMeshes[mesh_key].size() > 1) {