Merge branch 'master' of github.com:highfidelity/hifi into fix-parent-grab

This commit is contained in:
Seth Alves 2017-09-26 10:14:21 -07:00
commit afeb98059b

View file

@ -75,7 +75,7 @@ void main(void) {
max(0, 1.0 - shininess / 128.0), max(0, 1.0 - shininess / 128.0),
DEFAULT_METALLIC, DEFAULT_METALLIC,
specular, specular,
specular); vec3(clamp(emissiveAmount, 0.0, 1.0)));
} else { } else {
packDeferredFragment( packDeferredFragment(
normal, normal,