aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRealBadAngel <maciej.kasatkin@o2.pl>2015-07-02 21:36:45 +0200
committerRealBadAngel <maciej.kasatkin@o2.pl>2015-07-02 21:36:45 +0200
commit8a85e5e58decf77df27d114574026ff8032b8a45 (patch)
treeb2cabead53ee5bed8e157e309e3d63f447338495 /src
parent75d2cfef5cedd47dd0141953f61ae6ba5b0c8ded (diff)
downloadminetest-8a85e5e58decf77df27d114574026ff8032b8a45.tar.gz
minetest-8a85e5e58decf77df27d114574026ff8032b8a45.tar.bz2
minetest-8a85e5e58decf77df27d114574026ff8032b8a45.zip
Shaders fixes and cleanup relief mapping code.
Diffstat (limited to 'src')
-rw-r--r--src/shader.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/shader.cpp b/src/shader.cpp
index a6d18e1be..7e4f40810 100644
--- a/src/shader.cpp
+++ b/src/shader.cpp
@@ -731,8 +731,11 @@ ShaderInfo generate_shader(std::string name, u8 material_type, u8 drawtype,
shaders_header += "\n";
}
+ shaders_header += "#define USE_NORMALMAPS ";
if (g_settings->getBool("enable_bumpmapping") || g_settings->getBool("enable_parallax_occlusion"))
- shaders_header += "#define USE_NORMALMAPS\n";
+ shaders_header += "1\n";
+ else
+ shaders_header += "0\n";
if (g_settings->getBool("enable_waving_water")){
shaders_header += "#define ENABLE_WAVING_WATER 1\n";