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

bugfix for joining meshes, need to also check noselect flag

Browse Source
This commit is contained in:
Mark Vejvoda
2013-06-22 21:47:50 +00:00
parent 1520cdcea0
commit b418d46254
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

@@ -1577,7 +1577,8 @@ void Model::autoJoinMeshFrames() {
string mesh_key = ((mesh.getTextureFlags() & 1) && mesh.getTexture(0) ? mesh.getTexture(0)->getPath() : "none");
mesh_key += string("_") + intToStr(mesh.getFrameCount()) +
string("_") + intToStr(mesh.getTwoSided()) +
string("_") + intToStr(mesh.getCustomTexture());
string("_") + intToStr(mesh.getCustomTexture()) +
string("_") + intToStr(mesh.getNoSelect());
joinedMeshes[mesh_key].add(index,&mesh);
if(haveJoinedMeshes == false && joinedMeshes[mesh_key].size() > 1) {