Fixing latest PR

dist/preview release - beta/babylon.2.2.max.js

@@ -26690,6 +26690,11 @@ var BABYLON;
             var height = 1;
             var depth = 1;
             var faceUV = options.faceUV || new Array(6);
+            var faceColors;
+            var colors = [];
+            if (options.faceColors) {
+                faceColors = options.faceColors;
+            }
             if (options.width !== undefined) {
                 width = options.width || 1;
                 height = options.height || 1;
@@ -26700,12 +26705,15 @@ var BABYLON;
                 height = options || 1;
                 depth = options || 1;
             }
+            sideOrientation = sideOrientation || options.sideOrientation || BABYLON.Mesh.DEFAULTSIDE;
             for (var f = 0; f < 6; f++) {
                 if (faceUV[f] === undefined) {
                     faceUV[f] = new BABYLON.Vector4(0, 0, 1, 1);
                 }
+                if (faceColors && faceColors[f] === undefined) {
+                    faceColors[f] = new BABYLON.Color4(1, 1, 1, 1);
+                }
             }
-            sideOrientation = sideOrientation || options.sideOrientation || BABYLON.Mesh.DEFAULTSIDE;
             var scaleVector = new BABYLON.Vector3(width / 2, height / 2, depth / 2);
             // Create each face in turn.
             for (var index = 0; index < normalsSource.length; index++) {
@@ -26726,18 +26734,30 @@ var BABYLON;
                 positions.push(vertex.x, vertex.y, vertex.z);
                 normals.push(normal.x, normal.y, normal.z);
                 uvs.push(faceUV[index].z, faceUV[index].w);
+                if (faceColors) {
+                    colors.push(faceColors[index].r, faceColors[index].g, faceColors[index].b, faceColors[index].a);
+                }
                 vertex = normal.subtract(side1).add(side2).multiply(scaleVector);
                 positions.push(vertex.x, vertex.y, vertex.z);
                 normals.push(normal.x, normal.y, normal.z);
                 uvs.push(faceUV[index].x, faceUV[index].w);
+                if (faceColors) {
+                    colors.push(faceColors[index].r, faceColors[index].g, faceColors[index].b, faceColors[index].a);
+                }
                 vertex = normal.add(side1).add(side2).multiply(scaleVector);
                 positions.push(vertex.x, vertex.y, vertex.z);
                 normals.push(normal.x, normal.y, normal.z);
                 uvs.push(faceUV[index].x, faceUV[index].y);
+                if (faceColors) {
+                    colors.push(faceColors[index].r, faceColors[index].g, faceColors[index].b, faceColors[index].a);
+                }
                 vertex = normal.add(side1).subtract(side2).multiply(scaleVector);
                 positions.push(vertex.x, vertex.y, vertex.z);
                 normals.push(normal.x, normal.y, normal.z);
                 uvs.push(faceUV[index].z, faceUV[index].y);
+                if (faceColors) {
+                    colors.push(faceColors[index].r, faceColors[index].g, faceColors[index].b, faceColors[index].a);
+                }
             }
             // sides
             VertexData._ComputeSides(sideOrientation, positions, indices, normals, uvs);
@@ -26747,6 +26767,10 @@ var BABYLON;
             vertexData.positions = positions;
             vertexData.normals = normals;
             vertexData.uvs = uvs;
+            if (faceColors) {
+                var totalColors = (sideOrientation === BABYLON.Mesh.DOUBLESIDE) ? colors.concat(colors) : colors;
+                vertexData.colors = totalColors;
+            }
             return vertexData;
         };
         VertexData.CreateSphere = function (options, diameter, sideOrientation) {

src/Cameras/VR/babylon.vrDeviceOrientationCamera.js

@@ -46,3 +46,4 @@ var BABYLON;
     })(BABYLON.FreeCamera);
     BABYLON.VRDeviceOrientationFreeCamera = VRDeviceOrientationFreeCamera;
 })(BABYLON || (BABYLON = {}));
+//# sourceMappingURL=babylon.vrDeviceOrientationCamera.js.map

src/Cameras/VR/babylon.webVRCamera.js

@@ -72,3 +72,4 @@ var BABYLON;
     })(BABYLON.FreeCamera);
     BABYLON.WebVRFreeCamera = WebVRFreeCamera;
 })(BABYLON || (BABYLON = {}));
+//# sourceMappingURL=babylon.webVRCamera.js.map

src/Culling/Octrees/babylon.octree.js

@@ -86,3 +86,4 @@ var BABYLON;
     })();
     BABYLON.Octree = Octree;
 })(BABYLON || (BABYLON = {}));
+//# sourceMappingURL=babylon.octree.js.map

src/Culling/Octrees/babylon.octreeBlock.js

@@ -120,3 +120,4 @@ var BABYLON;
     })();
     BABYLON.OctreeBlock = OctreeBlock;
 })(BABYLON || (BABYLON = {}));
+//# sourceMappingURL=babylon.octreeBlock.js.map

src/Lights/Shadows/babylon.shadowGenerator.js

@@ -333,3 +333,4 @@ var BABYLON;
     })();
     BABYLON.ShadowGenerator = ShadowGenerator;
 })(BABYLON || (BABYLON = {}));
+//# sourceMappingURL=babylon.shadowGenerator.js.map

src/Loading/Plugins/babylon.babylonFileLoader.js

@@ -1427,3 +1427,4 @@ var BABYLON;
         });
     })(Internals = BABYLON.Internals || (BABYLON.Internals = {}));
 })(BABYLON || (BABYLON = {}));
+//# sourceMappingURL=babylon.babylonFileLoader.js.map

src/Materials/Textures/Procedurals/babylon.customProceduralTexture.js

@@ -123,3 +123,4 @@ var BABYLON;
     })(BABYLON.ProceduralTexture);
     BABYLON.CustomProceduralTexture = CustomProceduralTexture;
 })(BABYLON || (BABYLON = {}));
+//# sourceMappingURL=babylon.customProceduralTexture.js.map

src/Materials/Textures/Procedurals/babylon.proceduralTexture.js

@@ -248,3 +248,4 @@ var BABYLON;
     })(BABYLON.Texture);
     BABYLON.ProceduralTexture = ProceduralTexture;
 })(BABYLON || (BABYLON = {}));
+//# sourceMappingURL=babylon.proceduralTexture.js.map

src/Materials/Textures/Procedurals/babylon.standardProceduralTexture.js

@@ -418,3 +418,4 @@ var BABYLON;
     })(BABYLON.ProceduralTexture);
     BABYLON.MarbleProceduralTexture = MarbleProceduralTexture;
 })(BABYLON || (BABYLON = {}));
+//# sourceMappingURL=babylon.standardProceduralTexture.js.map

src/Materials/Textures/babylon.baseTexture.js

@@ -125,3 +125,4 @@ var BABYLON;
     })();
     BABYLON.BaseTexture = BaseTexture;
 })(BABYLON || (BABYLON = {}));
+//# sourceMappingURL=babylon.baseTexture.js.map

src/Materials/Textures/babylon.cubeTexture.js

@@ -59,3 +59,4 @@ var BABYLON;
     })(BABYLON.BaseTexture);
     BABYLON.CubeTexture = CubeTexture;
 })(BABYLON || (BABYLON = {}));
+//# sourceMappingURL=babylon.cubeTexture.js.map

src/Materials/Textures/babylon.dynamicTexture.js

@@ -92,3 +92,4 @@ var BABYLON;
     })(BABYLON.Texture);
     BABYLON.DynamicTexture = DynamicTexture;
 })(BABYLON || (BABYLON = {}));
+//# sourceMappingURL=babylon.dynamicTexture.js.map

src/Materials/Textures/babylon.mirrorTexture.js

@@ -43,3 +43,4 @@ var BABYLON;
     })(BABYLON.RenderTargetTexture);
     BABYLON.MirrorTexture = MirrorTexture;
 })(BABYLON || (BABYLON = {}));
+//# sourceMappingURL=babylon.mirrorTexture.js.map

src/Materials/Textures/babylon.rawTexture.js

@@ -56,3 +56,4 @@ var BABYLON;
     })(BABYLON.Texture);
     BABYLON.RawTexture = RawTexture;
 })(BABYLON || (BABYLON = {}));
+//# sourceMappingURL=babylon.rawTexture.js.map

src/Materials/Textures/babylon.renderTargetTexture.js

@@ -165,3 +165,4 @@ var BABYLON;
     })(BABYLON.Texture);
     BABYLON.RenderTargetTexture = RenderTargetTexture;
 })(BABYLON || (BABYLON = {}));
+//# sourceMappingURL=babylon.renderTargetTexture.js.map

src/Materials/Textures/babylon.texture.js

@@ -212,3 +212,4 @@ var BABYLON;
     })(BABYLON.BaseTexture);
     BABYLON.Texture = Texture;
 })(BABYLON || (BABYLON = {}));
+//# sourceMappingURL=babylon.texture.js.map

src/Materials/Textures/babylon.videoTexture.js

@@ -57,3 +57,4 @@ var BABYLON;
     })(BABYLON.Texture);
     BABYLON.VideoTexture = VideoTexture;
 })(BABYLON || (BABYLON = {}));
+//# sourceMappingURL=babylon.videoTexture.js.map

src/Mesh/babylon.mesh.vertexData.js

@@ -488,6 +488,11 @@ var BABYLON;
             var height = 1;
             var depth = 1;
             var faceUV = options.faceUV || new Array(6);
+            var faceColors;
+            var colors = [];
+            if (options.faceColors) {
+                faceColors = options.faceColors;
+            }
             if (options.width !== undefined) {
                 width = options.width || 1;
                 height = options.height || 1;
@@ -498,12 +503,15 @@ var BABYLON;
                 height = options || 1;
                 depth = options || 1;
             }
+            sideOrientation = sideOrientation || options.sideOrientation || BABYLON.Mesh.DEFAULTSIDE;
             for (var f = 0; f < 6; f++) {
                 if (faceUV[f] === undefined) {
                     faceUV[f] = new BABYLON.Vector4(0, 0, 1, 1);
                 }
+                if (faceColors && faceColors[f] === undefined) {
+                    faceColors[f] = new BABYLON.Color4(1, 1, 1, 1);
+                }
             }
-            sideOrientation = sideOrientation || options.sideOrientation || BABYLON.Mesh.DEFAULTSIDE;
             var scaleVector = new BABYLON.Vector3(width / 2, height / 2, depth / 2);
             // Create each face in turn.
             for (var index = 0; index < normalsSource.length; index++) {
@@ -524,18 +532,30 @@ var BABYLON;
                 positions.push(vertex.x, vertex.y, vertex.z);
                 normals.push(normal.x, normal.y, normal.z);
                 uvs.push(faceUV[index].z, faceUV[index].w);
+                if (faceColors) {
+                    colors.push(faceColors[index].r, faceColors[index].g, faceColors[index].b, faceColors[index].a);
+                }
                 vertex = normal.subtract(side1).add(side2).multiply(scaleVector);
                 positions.push(vertex.x, vertex.y, vertex.z);
                 normals.push(normal.x, normal.y, normal.z);
                 uvs.push(faceUV[index].x, faceUV[index].w);
+                if (faceColors) {
+                    colors.push(faceColors[index].r, faceColors[index].g, faceColors[index].b, faceColors[index].a);
+                }
                 vertex = normal.add(side1).add(side2).multiply(scaleVector);
                 positions.push(vertex.x, vertex.y, vertex.z);
                 normals.push(normal.x, normal.y, normal.z);
                 uvs.push(faceUV[index].x, faceUV[index].y);
+                if (faceColors) {
+                    colors.push(faceColors[index].r, faceColors[index].g, faceColors[index].b, faceColors[index].a);
+                }
                 vertex = normal.add(side1).subtract(side2).multiply(scaleVector);
                 positions.push(vertex.x, vertex.y, vertex.z);
                 normals.push(normal.x, normal.y, normal.z);
                 uvs.push(faceUV[index].z, faceUV[index].y);
+                if (faceColors) {
+                    colors.push(faceColors[index].r, faceColors[index].g, faceColors[index].b, faceColors[index].a);
+                }
             }
             // sides
             VertexData._ComputeSides(sideOrientation, positions, indices, normals, uvs);
@@ -545,6 +565,10 @@ var BABYLON;
             vertexData.positions = positions;
             vertexData.normals = normals;
             vertexData.uvs = uvs;
+            if (faceColors) {
+                var totalColors = (sideOrientation === BABYLON.Mesh.DOUBLESIDE) ? colors.concat(colors) : colors;
+                vertexData.colors = totalColors;
+            }
             return vertexData;
         };
         VertexData.CreateSphere = function (options, diameter, sideOrientation) {

src/Mesh/babylon.mesh.vertexData.ts

@@ -590,13 +590,17 @@
             var positions = [];
             var normals = [];
             var uvs = [];
-            var colors = [];
 
             var width = 1;
             var height = 1;
             var depth = 1;
             var faceUV: Vector4[] = options.faceUV || new Array<Vector4>(6);
-            var faceColors: Color4[] = options.faceColors || new Array<Color4>(6);
+            var faceColors: Color4[];
+            var colors = [];
+
+            if (options.faceColors) {
+                faceColors = options.faceColors;
+            }
 
             if (options.width !== undefined) {
                 width = options.width || 1;
@@ -607,17 +611,17 @@
                 height = options || 1;
                 depth = options || 1;
             }
-            
+
             sideOrientation = sideOrientation || options.sideOrientation || Mesh.DEFAULTSIDE;
 
             for (var f = 0; f < 6; f++) {
                 if (faceUV[f] === undefined) {
                     faceUV[f] = new Vector4(0, 0, 1, 1);
                 }
-                if (faceColors[f] === undefined) {
+                if (faceColors && faceColors[f] === undefined) {
                     faceColors[f] = new Color4(1, 1, 1, 1);
                 }
-            }            
+            }
 
             var scaleVector = new Vector3(width / 2, height / 2, depth / 2);
 
@@ -644,25 +648,33 @@
                 positions.push(vertex.x, vertex.y, vertex.z);
                 normals.push(normal.x, normal.y, normal.z);
                 uvs.push(faceUV[index].z, faceUV[index].w);
-                colors.push(faceColors[index].r, faceColors[index].g, faceColors[index].b, faceColors[index].a);
+                if (faceColors) {
+                    colors.push(faceColors[index].r, faceColors[index].g, faceColors[index].b, faceColors[index].a);
+                }
 
                 vertex = normal.subtract(side1).add(side2).multiply(scaleVector);
                 positions.push(vertex.x, vertex.y, vertex.z);
                 normals.push(normal.x, normal.y, normal.z);
                 uvs.push(faceUV[index].x, faceUV[index].w);
-                colors.push(faceColors[index].r, faceColors[index].g, faceColors[index].b, faceColors[index].a);
+                if (faceColors) {
+                    colors.push(faceColors[index].r, faceColors[index].g, faceColors[index].b, faceColors[index].a);
+                }
 
                 vertex = normal.add(side1).add(side2).multiply(scaleVector);
                 positions.push(vertex.x, vertex.y, vertex.z);
                 normals.push(normal.x, normal.y, normal.z);
                 uvs.push(faceUV[index].x, faceUV[index].y);
-                colors.push(faceColors[index].r, faceColors[index].g, faceColors[index].b, faceColors[index].a);
+                if (faceColors) {
+                    colors.push(faceColors[index].r, faceColors[index].g, faceColors[index].b, faceColors[index].a);
+                }
 
                 vertex = normal.add(side1).subtract(side2).multiply(scaleVector);
                 positions.push(vertex.x, vertex.y, vertex.z);
                 normals.push(normal.x, normal.y, normal.z);
                 uvs.push(faceUV[index].z, faceUV[index].y);
-                colors.push(faceColors[index].r, faceColors[index].g, faceColors[index].b, faceColors[index].a);
+                if (faceColors) {
+                    colors.push(faceColors[index].r, faceColors[index].g, faceColors[index].b, faceColors[index].a);
+                }
             }
 
             // sides
@@ -675,8 +687,11 @@
             vertexData.positions = positions;
             vertexData.normals = normals;
             vertexData.uvs = uvs;
-            var totalColors = (sideOrientation == Mesh.DOUBLESIDE) ? colors.concat(colors) : colors;
-            vertexData.colors = totalColors;
+
+            if (faceColors) {
+                var totalColors = (sideOrientation === Mesh.DOUBLESIDE) ? colors.concat(colors) : colors;
+                vertexData.colors = totalColors;
+            }
 
             return vertexData;
         }
@@ -1511,3 +1526,4 @@
 
 
 
+

src/Physics/Plugins/babylon.cannonJSPlugin.js

@@ -251,3 +251,4 @@ var BABYLON;
     })();
     BABYLON.CannonJSPlugin = CannonJSPlugin;
 })(BABYLON || (BABYLON = {}));
+//# sourceMappingURL=babylon.cannonJSPlugin.js.map

src/Physics/Plugins/babylon.oimoJSPlugin.js

@@ -314,3 +314,4 @@ var BABYLON;
     })();
     BABYLON.OimoJSPlugin = OimoJSPlugin;
 })(BABYLON || (BABYLON = {}));
+//# sourceMappingURL=babylon.oimoJSPlugin.js.map

src/PostProcess/RenderPipeline/babylon.postProcessRenderEffect.js

@@ -138,3 +138,4 @@ var BABYLON;
     })();
     BABYLON.PostProcessRenderEffect = PostProcessRenderEffect;
 })(BABYLON || (BABYLON = {}));
+//# sourceMappingURL=babylon.postProcessRenderEffect.js.map

src/PostProcess/RenderPipeline/babylon.postProcessRenderPass.js

@@ -40,3 +40,4 @@ var BABYLON;
     })();
     BABYLON.PostProcessRenderPass = PostProcessRenderPass;
 })(BABYLON || (BABYLON = {}));
+//# sourceMappingURL=babylon.postProcessRenderPass.js.map

src/PostProcess/RenderPipeline/babylon.postProcessRenderPipeline.js

@@ -110,3 +110,4 @@ var BABYLON;
     })();
     BABYLON.PostProcessRenderPipeline = PostProcessRenderPipeline;
 })(BABYLON || (BABYLON = {}));
+//# sourceMappingURL=babylon.postProcessRenderPipeline.js.map

src/PostProcess/RenderPipeline/babylon.postProcessRenderPipelineManager.js

@@ -58,3 +58,4 @@ var BABYLON;
     })();
     BABYLON.PostProcessRenderPipelineManager = PostProcessRenderPipelineManager;
 })(BABYLON || (BABYLON = {}));
+//# sourceMappingURL=babylon.postProcessRenderPipelineManager.js.map