diff options
| author | Weblate <42@minetest.ru> | 2013-06-21 10:24:16 +0200 |
|---|---|---|
| committer | Weblate <42@minetest.ru> | 2013-06-21 10:24:16 +0200 |
| commit | 3af90db5b51da0c37f77fe6410e488c8c27acd67 (patch) | |
| tree | 12edd6f0661b464e36863517241b5ec0b87b5ec1 /src/mapblock_mesh.cpp | |
| parent | 58f3cd3eb598a7cf79983fe9e48c738591c6e004 (diff) | |
| parent | b1ebd9f79c63cf78b0e0fb2ea6f52d82cdfb95b6 (diff) | |
| download | minetest-3af90db5b51da0c37f77fe6410e488c8c27acd67.tar.xz | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'src/mapblock_mesh.cpp')
| -rw-r--r-- | src/mapblock_mesh.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/mapblock_mesh.cpp b/src/mapblock_mesh.cpp index 0f83e863c..be88b1973 100644 --- a/src/mapblock_mesh.cpp +++ b/src/mapblock_mesh.cpp @@ -717,8 +717,7 @@ TileSpec getNodeTile(MapNode mn, v3s16 p, v3s16 dir, MeshMakeData *data) u16 tile_index=facedir*16 + dir_i; TileSpec spec = getNodeTileN(mn, p, dir_to_tile[tile_index], data); spec.rotation=dir_to_tile[tile_index + 1]; - std::string name = data->m_gamedef->tsrc()->getTextureName(spec.texture.id); - spec.texture = data->m_gamedef->tsrc()->getTexture(name); + spec.texture = data->m_gamedef->tsrc()->getTexture(spec.texture.id); return spec; } @@ -1200,7 +1199,6 @@ MapBlockMesh::MapBlockMesh(MeshMakeData *data): */ translateMesh(m_mesh, intToFloat(data->m_blockpos * MAP_BLOCKSIZE, BS)); - m_mesh->recalculateBoundingBox(); // translateMesh already does this if(m_mesh) { |