From b418d46254f1631e6b4374011582aad3bf8ca0b6 Mon Sep 17 00:00:00 2001 From: Mark Vejvoda Date: Sat, 22 Jun 2013 21:47:50 +0000 Subject: [PATCH] bugfix for joining meshes, need to also check noselect flag --- source/shared_lib/sources/graphics/model.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/source/shared_lib/sources/graphics/model.cpp b/source/shared_lib/sources/graphics/model.cpp index edeb5fc2e..b7145e265 100644 --- a/source/shared_lib/sources/graphics/model.cpp +++ b/source/shared_lib/sources/graphics/model.cpp @@ -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) {