Commit 9f14f881 authored by Jan Möbius's avatar Jan Möbius
Browse files

Merge branch 'fixGLShininess' into 'master'

fixed setting shininess

Closes OpenFlipper-Free#138

See merge request !46
parents 1275ee2d 8994e8fd
......@@ -758,13 +758,13 @@ void GLState::set_overlay_color(const Vec4f& _col)
void GLState::set_shininess(float _shininess)
shininess_ = _shininess;
shininess_ = _shininess;
if (updateGL_ && compatibilityProfile_)
glMaterialf(GL_FRONT_AND_BACK, GL_SHININESS, _shininess);
glMaterialf(GL_FRONT_AND_BACK, GL_SHININESS, std::min(128.f, _shininess));
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment