TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 02:15:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	panda/src/glstuff/glShaderContext_src.cxx
This commit is contained in:
rdb 2016-01-03 20:11:04 +01:00
commit aa3f3ab51b
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
panda/src/glstuff/glGraphicsStateGuardian_src.cxx
View File

@ -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