Merge branch 'stable' of github.com:playcanvas/engine into stable

playcanvas · Jul 22, 2015 · 9284fd8 · 9284fd8
2 parents 47897c1 + ae965ac
commit 9284fd8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/graphics/programlib/chunks/start.frag b/src/graphics/programlib/chunks/start.frag
@@ -4,5 +4,6 @@ void main(void) {
 	data.diffuseLight = vec3(0);
 	data.specularLight = vec3(0);
     data.reflection = vec4(0);
+    data.specularity = vec3(0);
 
 
diff --git a/src/graphics/programlib/programlib_phong.js b/src/graphics/programlib/programlib_phong.js
@@ -141,7 +141,7 @@ pc.programlib.phong = {
         if (options.cubeMap || options.prefilteredCubemap) options.sphereMap = null; // cubeMaps have higher priority
         if (options.dpAtlas) options.sphereMap = options.cubeMap = options.prefilteredCubemap = cubemapReflection = null; // dp has even higher priority
         if (!options.useSpecular) options.specularMap = options.glossMap = null;
-        var needsNormal = lighting || reflections || options.ambientSH;
+        var needsNormal = lighting || reflections || options.ambientSH || options.prefilteredCubemap;
 
         this.options = options;