Browse Source

Merge remote-tracking branch 'origin/release/1.9.x'

Conflicts:
	panda/src/glstuff/glShaderContext_src.cxx
rdb 10 years ago
parent
commit
aa3f3ab51b
1 changed files with 1 additions and 1 deletions
  1. 1 1
      panda/src/glstuff/glGraphicsStateGuardian_src.cxx

+ 1 - 1
panda/src/glstuff/glGraphicsStateGuardian_src.cxx

@@ -6749,7 +6749,7 @@ do_issue_material() {
 
 
   call_glMaterialfv(face, GL_SPECULAR, material->get_specular());
   call_glMaterialfv(face, GL_SPECULAR, material->get_specular());
   call_glMaterialfv(face, GL_EMISSION, material->get_emission());
   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()) {
   if (material->has_ambient() && material->has_diffuse()) {
     // The material has both an ambient and diffuse specified.  This
     // The material has both an ambient and diffuse specified.  This