From 9549b7f87a9313a0df0becd8c038f7855a2a2050 Mon Sep 17 00:00:00 2001 From: Mark Vejvoda Date: Sat, 22 Jun 2013 22:41:37 +0000 Subject: [PATCH] bugfix for join meshes, add opacity check also --- 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 b7145e26..b1c3611c 100644 --- a/source/shared_lib/sources/graphics/model.cpp +++ b/source/shared_lib/sources/graphics/model.cpp @@ -1578,7 +1578,8 @@ void Model::autoJoinMeshFrames() { mesh_key += string("_") + intToStr(mesh.getFrameCount()) + string("_") + intToStr(mesh.getTwoSided()) + string("_") + intToStr(mesh.getCustomTexture()) + - string("_") + intToStr(mesh.getNoSelect()); + string("_") + intToStr(mesh.getNoSelect()) + + string("_") + floatToStr(mesh.getOpacity()); joinedMeshes[mesh_key].add(index,&mesh); if(haveJoinedMeshes == false && joinedMeshes[mesh_key].size() > 1) {