diff options
| author | RealBadAngel <maciej.kasatkin@o2.pl> | 2015-07-16 15:36:48 +0200 |
|---|---|---|
| committer | RealBadAngel <maciej.kasatkin@o2.pl> | 2015-07-16 15:36:48 +0200 |
| commit | 655fc6010ffd4be7de315be261df2a61d5d4538a (patch) | |
| tree | a61da651c2647f10f4bfcce3a341aba170ffa164 /src/mapblock_mesh.cpp | |
| parent | b30e8d8ec689fbb65b1cee6fb6ff79322b204d0d (diff) | |
| download | minetest-655fc6010ffd4be7de315be261df2a61d5d4538a.tar.gz minetest-655fc6010ffd4be7de315be261df2a61d5d4538a.tar.bz2 minetest-655fc6010ffd4be7de315be261df2a61d5d4538a.zip | |
Fix relief mapping issues
Diffstat (limited to 'src/mapblock_mesh.cpp')
| -rw-r--r-- | src/mapblock_mesh.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/mapblock_mesh.cpp b/src/mapblock_mesh.cpp index 145ab40c2..32f6e659a 100644 --- a/src/mapblock_mesh.cpp +++ b/src/mapblock_mesh.cpp @@ -1213,10 +1213,8 @@ MapBlockMesh::MapBlockMesh(MeshMakeData *data, v3s16 camera_offset): p.tile.applyMaterialOptionsWithShaders(material); if (p.tile.normal_texture) { material.setTexture(1, p.tile.normal_texture); - material.setTexture(2, m_tsrc->getTextureForMesh("enable_img.png")); - } else { - material.setTexture(2, m_tsrc->getTextureForMesh("disable_img.png")); } + material.setTexture(2, p.tile.flags_texture); } else { p.tile.applyMaterialOptions(material); } @@ -1349,10 +1347,8 @@ bool MapBlockMesh::animate(bool faraway, float time, int crack, u32 daynight_rat if (m_enable_shaders) { if (animation_frame.normal_texture) { buf->getMaterial().setTexture(1, animation_frame.normal_texture); - buf->getMaterial().setTexture(2, m_tsrc->getTextureForMesh("enable_img.png")); - } else { - buf->getMaterial().setTexture(2, m_tsrc->getTextureForMesh("disable_img.png")); } + buf->getMaterial().setTexture(2, animation_frame.flags_texture); } } |