diff options
| author | Perttu Ahola <celeron55@gmail.com> | 2012-12-02 02:57:14 +0200 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2012-12-02 02:59:15 +0200 |
| commit | 3e07c5bf822afe01525a9a3ef499ae895c22a130 (patch) | |
| tree | 384ef75570c59eda5b6af738282ed19d824eff1c /src/mapblock_mesh.cpp | |
| parent | ca16119adbec2b2f5225435bac76a3c5eb081dfa (diff) | |
| download | minetest-3e07c5bf822afe01525a9a3ef499ae895c22a130.tar.gz minetest-3e07c5bf822afe01525a9a3ef499ae895c22a130.tar.bz2 minetest-3e07c5bf822afe01525a9a3ef499ae895c22a130.zip | |
Fix tile MaterialType to make sense and make lava surface be shader'd lower like water
Diffstat (limited to 'src/mapblock_mesh.cpp')
| -rw-r--r-- | src/mapblock_mesh.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/mapblock_mesh.cpp b/src/mapblock_mesh.cpp index c871b6dbe..a9f14f8f0 100644 --- a/src/mapblock_mesh.cpp +++ b/src/mapblock_mesh.cpp @@ -1081,14 +1081,10 @@ MapBlockMesh::MapBlockMesh(MeshMakeData *data): material.MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF; material.setTexture(0, p.tile.texture.atlas); - p.tile.applyMaterialOptions(material); - - if(enable_shaders){ - if(material.MaterialType == video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF) - material.MaterialType = shadermat1; - if(material.MaterialType == video::EMT_TRANSPARENT_VERTEX_ALPHA) - material.MaterialType = shadermat2; - } + if(enable_shaders) + p.tile.applyMaterialOptionsWithShaders(material, shadermat1, shadermat2); + else + p.tile.applyMaterialOptions(material); // Create meshbuffer |