From: Loic Blot <loic.blot@unix-experience.fr>
Date: Tue, 9 Feb 2016 22:46:20 +0000 (+0100)
Subject: Fix inverted conditions in shader.cpp
X-Git-Tag: 0.4.14~277
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ba8fa9e889b399d67f4e2172e7dbf7717fdc2b86;p=oweals%2Fminetest.git

Fix inverted conditions in shader.cpp
---

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()) {