Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-11-30 11:33:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix integer-string conversion for shaders

Browse Source 
closes #10605
This commit is contained in:
sfan5 2020-11-05 19:34:40 +01:00
parent 3356da0151
commit 627c22c36e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/client/shader.cpp
View File

@ -734,7 +734,7 @@ ShaderInfo generate_shader(const std::string &name, u8 material_type, u8 drawtyp
shaders_header += "#define "; shaders_header += "#define ";
shaders_header += drawTypes[i]; shaders_header += drawTypes[i];
shaders_header += " "; shaders_header += " ";
shaders_header += std::to_string(i); shaders_header += itos(i);
shaders_header += "\n"; shaders_header += "\n";
} }
@ -757,15 +757,15 @@ ShaderInfo generate_shader(const std::string &name, u8 material_type, u8 drawtyp
shaders_header += "#define "; shaders_header += "#define ";
shaders_header += materialTypes[i]; shaders_header += materialTypes[i];
shaders_header += " "; shaders_header += " ";
shaders_header += std::to_string(i); shaders_header += itos(i);
shaders_header += "\n"; shaders_header += "\n";
} }
shaders_header += "#define MATERIAL_TYPE "; shaders_header += "#define MATERIAL_TYPE ";
shaders_header += std::to_string(material_type); shaders_header += itos(material_type);
shaders_header += "\n"; shaders_header += "\n";
shaders_header += "#define DRAW_TYPE "; shaders_header += "#define DRAW_TYPE ";
shaders_header += std::to_string(drawtype); shaders_header += itos(drawtype);
shaders_header += "\n"; shaders_header += "\n";
if (g_settings->getBool("enable_waving_water")){ if (g_settings->getBool("enable_waving_water")){