From ba8fa9e889b399d67f4e2172e7dbf7717fdc2b86 Mon Sep 17 00:00:00 2001 From: Loic Blot Date: Tue, 9 Feb 2016 23:46:20 +0100 Subject: [PATCH] Fix inverted conditions in shader.cpp --- src/shader.cpp | 4 ++-- 1 file 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()) { -- 2.25.1