16
0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-19 17:59:18 +02:00

final merge fixes

This commit is contained in:
VB
2017-04-25 15:01:17 +02:00
parent 061be38219
commit e5ce5b001f
4 changed files with 10 additions and 9 deletions

View File

@@ -132,7 +132,7 @@ gl_program_light::gl_program_light(std::vector<gl_shader> v) : gl_program_mvp(v)
glUseProgram(id);
glUniform3f(ambient_uniform, 1.0f, 1.0f, 1.0f);
glUniform1i(lcount_uniform, 0);
glUniform1ui(lcount_uniform, 0);
}
void gl_program_light::set_ambient(glm::vec3 &ambient)