@@ -185,7 +185,7 @@ pc.programlib.phong = {
         if (chunks.extensionVS) {
         	code += chunks.extensionVS + "\n";
         }
-        
+
         code += chunks.baseVS;
 
         // Allow first shadow coords to be computed in VS
@@ -549,6 +549,7 @@ pc.programlib.phong = {
             }
         }
 
+
         if (numShadowLights > 0) {
             code += chunks.shadowCoordPS + chunks.shadowPS;
             if (mainShadowLight>=0) code += chunks.shadowVSPS;
 
@@ -18,7 +18,7 @@ pc.extend(pc, function () {
         if (!node.enabled) return;
 
         var i;
-        if (node.model && node.model.model) {
+        if (node.model && node.model.model && node.model.enabled) {
             if (allNodes) allNodes.push(node);
             if (node.model.data.lightmapped) {
                 if (nodes) {
@@ -276,9 +276,15 @@ pc.extend(pc, function () {
 
             // Store scene values
             var origFog = scene.fog;
+            var origAmbientR = scene.ambientLight.r;
+            var origAmbientG = scene.ambientLight.g;
+            var origAmbientB = scene.ambientLight.b;
             var origDrawCalls = scene.drawCalls;
 
             scene.fog = pc.FOG_NONE;
+            scene.ambientLight.r = 0;
+            scene.ambientLight.g = 0;
+            scene.ambientLight.b = 0;
 
             // Create pseudo-camera
             if (!lmCamera) {
@@ -343,6 +349,7 @@ pc.extend(pc, function () {
                 lmMaterial.cull = pc.CULLFACE_NONE;
                 lmMaterial.forceUv1 = true; // provide data to xformUv1
                 lmMaterial.update();
+                lmMaterial.updateShader(device, scene);
             }
 
             for(node=0; node<nodes.length; node++) {
@@ -464,6 +471,7 @@ pc.extend(pc, function () {
                     lmCamera.setRenderTarget(targTmp);
 
                     //console.log("Baking light "+lights[i]._node.name + " on model " + nodes[node].name);
+
                     this.renderer.render(scene, lmCamera);
                     stats.renderPasses++;
 
@@ -550,6 +558,9 @@ pc.extend(pc, function () {
             // Roll back scene stuff
             scene.drawCalls = origDrawCalls;
             scene.fog = origFog;
+            scene.ambientLight.r = origAmbientR;
+            scene.ambientLight.g = origAmbientG;
+            scene.ambientLight.b = origAmbientB;
 
             scene._updateLightStats(); // update statistics
Original file line number	Diff line number	Diff line change
`@@ -185,7 +185,7 @@ pc.programlib.phong = {`
`185`	`185`	`if (chunks.extensionVS) {`
`186`	`186`	`code += chunks.extensionVS + "\n";`
`187`	`187`	`}`
`188`		`-`
	`188`	`+`
`189`	`189`	`code += chunks.baseVS;`
`190`	`190`
`191`	`191`	`// Allow first shadow coords to be computed in VS`
`@@ -549,6 +549,7 @@ pc.programlib.phong = {`
`549`	`549`	`}`
`550`	`550`	`}`
`551`	`551`
	`552`	`+`
`552`	`553`	`if (numShadowLights > 0) {`
`553`	`554`	`code += chunks.shadowCoordPS + chunks.shadowPS;`
`554`	`555`	`if (mainShadowLight>=0) code += chunks.shadowVSPS;`