diff options
| author | Weblate <42@minetest.ru> | 2013-05-01 15:33:15 +0200 |
|---|---|---|
| committer | Weblate <42@minetest.ru> | 2013-05-01 15:33:15 +0200 |
| commit | 97cddd1b960e3b60ce74ff9ad16307b39676144e (patch) | |
| tree | 0547ab284acc0fdf8aad2a36643be6f78f786ef1 /src/mapblock_mesh.cpp | |
| parent | f1f2004cb9efb026625b192b404064c26ceb6d5f (diff) | |
| parent | 898a4e441fc0245aaf4821ff5e3dad0daccda3b5 (diff) | |
| download | minetest-97cddd1b960e3b60ce74ff9ad16307b39676144e.tar.gz minetest-97cddd1b960e3b60ce74ff9ad16307b39676144e.tar.bz2 minetest-97cddd1b960e3b60ce74ff9ad16307b39676144e.zip | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'src/mapblock_mesh.cpp')
| -rw-r--r-- | src/mapblock_mesh.cpp | 4 |
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); |