From 6a2e1a438c6ac77e24f7dcd28d577ad30577d37f Mon Sep 17 00:00:00 2001 From: rdb Date: Sat, 2 Jan 2016 21:48:25 +0100 Subject: [PATCH] Clamp shininess to 0 to avoid a GL error when negative shininess was entered --- panda/src/glstuff/glGraphicsStateGuardian_src.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/panda/src/glstuff/glGraphicsStateGuardian_src.cxx b/panda/src/glstuff/glGraphicsStateGuardian_src.cxx index 44dd4bbc91..429d2e9db8 100644 --- a/panda/src/glstuff/glGraphicsStateGuardian_src.cxx +++ b/panda/src/glstuff/glGraphicsStateGuardian_src.cxx @@ -6428,7 +6428,7 @@ do_issue_material() { call_glMaterialfv(face, GL_SPECULAR, material->get_specular()); call_glMaterialfv(face, GL_EMISSION, material->get_emission()); - glMaterialf(face, GL_SHININESS, min(material->get_shininess(), (PN_stdfloat)128.0)); + glMaterialf(face, GL_SHININESS, max(min(material->get_shininess(), (PN_stdfloat)128), (PN_stdfloat)0)); if (material->has_ambient() && material->has_diffuse()) { // The material has both an ambient and diffuse specified. This