summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLoic Blot <loic.blot@unix-experience.fr>2016-02-09 23:46:20 +0100
committerLoic Blot <loic.blot@unix-experience.fr>2016-02-09 23:50:37 +0100
commitba8fa9e889b399d67f4e2172e7dbf7717fdc2b86 (patch)
treed1850b8a99e415ae40f90542a2ba85e907f885b1 /src
parent4e3fe460e38bed832266ee3168463a262d7fa444 (diff)
downloadminetest-ba8fa9e889b399d67f4e2172e7dbf7717fdc2b86.tar.gz
minetest-ba8fa9e889b399d67f4e2172e7dbf7717fdc2b86.tar.bz2
minetest-ba8fa9e889b399d67f4e2172e7dbf7717fdc2b86.zip
Fix inverted conditions in shader.cpp
Diffstat (limited to 'src')
-rw-r--r--src/shader.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/shader.cpp b/src/shader.cpp
index 138ad2aac..d39a8307c 100644
--- a/src/shader.cpp
+++ b/src/shader.cpp
@@ -772,11 +772,11 @@ ShaderInfo generate_shader(std::string name, u8 material_type, u8 drawtype,
const c8* pixel_program_ptr = 0;
const c8* geometry_program_ptr = 0;
if (!vertex_program.empty()) {
- pixel_program = shaders_header + pixel_program;
+ vertex_program = shaders_header + vertex_program;
vertex_program_ptr = vertex_program.c_str();
}
if (!pixel_program.empty()) {
- vertex_program = shaders_header + vertex_program;
+ pixel_program = shaders_header + pixel_program;
pixel_program_ptr = pixel_program.c_str();
}
if (!geometry_program.empty()) {