Fix inverted conditions in shader.cpp

nerzhul · nerzhul · commit ba8fa9e889b3 · 2016-02-09T23:50:37.000+01:00
diff --git 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()) {

Original file line number	Diff line number	Diff line change
`@@ -772,11 +772,11 @@ ShaderInfo generate_shader(std::string name, u8 material_type, u8 drawtype,`
`772`	`772`	`const c8* pixel_program_ptr = 0;`
`773`	`773`	`const c8* geometry_program_ptr = 0;`
`774`	`774`	`if (!vertex_program.empty()) {`
`775`		`- pixel_program = shaders_header + pixel_program;`
	`775`	`+ vertex_program = shaders_header + vertex_program;`
`776`	`776`	`vertex_program_ptr = vertex_program.c_str();`
`777`	`777`	`}`
`778`	`778`	`if (!pixel_program.empty()) {`
`779`		`- vertex_program = shaders_header + vertex_program;`
	`779`	`+ pixel_program = shaders_header + pixel_program;`
`780`	`780`	`pixel_program_ptr = pixel_program.c_str();`
`781`	`781`	`}`
`782`	`782`	`if (!geometry_program.empty()) {`