summaryrefslogtreecommitdiff
path: root/src/mapblock_mesh.cpp
diff options
context:
space:
mode:
authorkwolekr <kwolekr@minetest.net>2013-04-23 18:39:10 -0400
committerkwolekr <kwolekr@minetest.net>2013-04-23 22:15:51 -0400
commit770305e28dc0ed9aea0eefe041477a46d64eee58 (patch)
tree2306e3f96cdb54848c12f5ee159b12cdb55dcfb2 /src/mapblock_mesh.cpp
parent36747794ab981e5d1cc085075979ef981e783b55 (diff)
downloadminetest-770305e28dc0ed9aea0eefe041477a46d64eee58.tar.gz
minetest-770305e28dc0ed9aea0eefe041477a46d64eee58.tar.bz2
minetest-770305e28dc0ed9aea0eefe041477a46d64eee58.zip
Add option to use texture alpha channel
Diffstat (limited to 'src/mapblock_mesh.cpp')
-rw-r--r--src/mapblock_mesh.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/mapblock_mesh.cpp b/src/mapblock_mesh.cpp
index f68a79e41..f8a0b5f06 100644
--- a/src/mapblock_mesh.cpp
+++ b/src/mapblock_mesh.cpp
@@ -1099,6 +1099,8 @@ MapBlockMesh::MapBlockMesh(MeshMakeData *data):
getShader("test_shader_1").material;
video::E_MATERIAL_TYPE shadermat2 = m_gamedef->getShaderSource()->
getShader("test_shader_2").material;
+ video::E_MATERIAL_TYPE shadermat3 = m_gamedef->getShaderSource()->
+ getShader("test_shader_3").material;
for(u32 i = 0; i < collector.prebuffers.size(); i++)
{
PreMeshBuffer &p = collector.prebuffers[i];
@@ -1174,7 +1176,7 @@ MapBlockMesh::MapBlockMesh(MeshMakeData *data):
= video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF;
material.setTexture(0, p.tile.texture.atlas);
if(enable_shaders)
- p.tile.applyMaterialOptionsWithShaders(material, shadermat1, shadermat2);
+ p.tile.applyMaterialOptionsWithShaders(material, shadermat1, shadermat2, shadermat3);
else
p.tile.applyMaterialOptions(material);