npm 3.1.0-beta5

dist/preview release/babylon.max.js

@@ -15203,12 +15203,6 @@ var BABYLON;
             var indices = this.getIndices();
             var normals = this.getVerticesData(BABYLON.VertexBuffer.NormalKind);
             var bInfo = this.getBoundingInfo();
-<<<<<<< HEAD
-            if (!bInfo) {
-                return this;
-            }
-=======
->>>>>>> 67c83069a447868ab6def9019c048533b0046690
             if (this._facetDepthSort && !this._facetDepthSortEnabled) {
                 // init arrays, matrix and sort function on first call
                 this._facetDepthSortEnabled = true;

dist/preview release/customConfigurations/minimalGLTFViewer/babylon.max.js

@@ -15203,12 +15203,6 @@ var BABYLON;
             var indices = this.getIndices();
             var normals = this.getVerticesData(BABYLON.VertexBuffer.NormalKind);
             var bInfo = this.getBoundingInfo();
-<<<<<<< HEAD
-            if (!bInfo) {
-                return this;
-            }
-=======
->>>>>>> 67c83069a447868ab6def9019c048533b0046690
             if (this._facetDepthSort && !this._facetDepthSortEnabled) {
                 // init arrays, matrix and sort function on first call
                 this._facetDepthSortEnabled = true;
@@ -80907,11 +80901,7 @@ var BABYLON;
                     loaded += request._loaded;
                     total += request._total;
                 }
-<<<<<<< HEAD
-                this._progressCallback(new ProgressEvent("GLTFLoaderProgress", {
-=======
                 this._progressCallback(GLTFLoader._progressEventFactory("GLTFLoaderProgress", {
->>>>>>> 67c83069a447868ab6def9019c048533b0046690
                     lengthComputable: true,
                     loaded: loaded,
                     total: total

dist/preview release/gui/package.json

@@ -4,7 +4,7 @@
     },
     "name": "babylonjs-gui",
     "description": "The Babylon.js GUI library is an extension you can use to generate interactive user interface. It is build on top of the DynamicTexture.",
-    "version": "3.1.0-beta3",
+    "version": "3.1.0-beta5",
     "repository": {
         "type": "git",
         "url": "https://github.com/BabylonJS/Babylon.js.git"

dist/preview release/inspector/babylon.inspector.d.ts

@@ -182,8 +182,6 @@ declare module INSPECTOR {
         };
         'Scene': {
             type: typeof BABYLON.Scene;
-<<<<<<< HEAD
-=======
         };
         'TransformNode': {
             type: typeof BABYLON.TransformNode;
@@ -192,7 +190,6 @@ declare module INSPECTOR {
         'AbstractMesh': {
             type: typeof BABYLON.AbstractMesh;
             format: (m: BABYLON.AbstractMesh) => string;
->>>>>>> 67c83069a447868ab6def9019c048533b0046690
         };
         'Mesh': {
             type: typeof BABYLON.Mesh;

dist/preview release/inspector/babylon.inspector.js

@@ -440,8 +440,6 @@ var INSPECTOR;
         },
         'Scene': {
             type: BABYLON.Scene,
-<<<<<<< HEAD
-=======
         },
         'TransformNode': {
             type: BABYLON.TransformNode,
@@ -450,7 +448,6 @@ var INSPECTOR;
         'AbstractMesh': {
             type: BABYLON.AbstractMesh,
             format: function (m) { return m.name; }
->>>>>>> 67c83069a447868ab6def9019c048533b0046690
         },
         'Mesh': {
             type: BABYLON.Mesh,

dist/preview release/inspector/package.json

@@ -4,7 +4,7 @@
     },
     "name": "babylonjs-inspector",
     "description": "The Babylon.js inspector.",
-    "version": "3.1.0-beta3",
+    "version": "3.1.0-beta5",
     "repository": {
         "type": "git",
         "url": "https://github.com/BabylonJS/Babylon.js.git"

dist/preview release/loaders/babylon.glTF2FileLoader.js

@@ -408,20 +408,6 @@ var BABYLON;
             GLTFLoader.prototype._onProgress = function () {
                 if (!this._progressCallback) {
                     return;
-<<<<<<< HEAD
-                }
-                var loaded = 0;
-                var total = 0;
-                for (var _i = 0, _a = this._requests; _i < _a.length; _i++) {
-                    var request = _a[_i];
-                    if (!request._loaded || !request._total) {
-                        return;
-                    }
-                    loaded += request._loaded;
-                    total += request._total;
-                }
-                this._progressCallback(new ProgressEvent("GLTFLoaderProgress", {
-=======
                 }
                 var loaded = 0;
                 var total = 0;
@@ -434,7 +420,6 @@ var BABYLON;
                     total += request._total;
                 }
                 this._progressCallback(GLTFLoader._progressEventFactory("GLTFLoaderProgress", {
->>>>>>> 67c83069a447868ab6def9019c048533b0046690
                     lengthComputable: true,
                     loaded: loaded,
                     total: total

dist/preview release/loaders/babylon.glTFFileLoader.js

@@ -2553,20 +2553,6 @@ var BABYLON;
             GLTFLoader.prototype._onProgress = function () {
                 if (!this._progressCallback) {
                     return;
-<<<<<<< HEAD
-                }
-                var loaded = 0;
-                var total = 0;
-                for (var _i = 0, _a = this._requests; _i < _a.length; _i++) {
-                    var request = _a[_i];
-                    if (!request._loaded || !request._total) {
-                        return;
-                    }
-                    loaded += request._loaded;
-                    total += request._total;
-                }
-                this._progressCallback(new ProgressEvent("GLTFLoaderProgress", {
-=======
                 }
                 var loaded = 0;
                 var total = 0;
@@ -2579,7 +2565,6 @@ var BABYLON;
                     total += request._total;
                 }
                 this._progressCallback(GLTFLoader._progressEventFactory("GLTFLoaderProgress", {
->>>>>>> 67c83069a447868ab6def9019c048533b0046690
                     lengthComputable: true,
                     loaded: loaded,
                     total: total

dist/preview release/loaders/babylonjs.loaders.js

@@ -3509,20 +3509,6 @@ var BABYLON;
             GLTFLoader.prototype._onProgress = function () {
                 if (!this._progressCallback) {
                     return;
-<<<<<<< HEAD
-                }
-                var loaded = 0;
-                var total = 0;
-                for (var _i = 0, _a = this._requests; _i < _a.length; _i++) {
-                    var request = _a[_i];
-                    if (!request._loaded || !request._total) {
-                        return;
-                    }
-                    loaded += request._loaded;
-                    total += request._total;
-                }
-                this._progressCallback(new ProgressEvent("GLTFLoaderProgress", {
-=======
                 }
                 var loaded = 0;
                 var total = 0;
@@ -3535,7 +3521,6 @@ var BABYLON;
                     total += request._total;
                 }
                 this._progressCallback(GLTFLoader._progressEventFactory("GLTFLoaderProgress", {
->>>>>>> 67c83069a447868ab6def9019c048533b0046690
                     lengthComputable: true,
                     loaded: loaded,
                     total: total

dist/preview release/loaders/package.json

@@ -4,7 +4,7 @@
     },
     "name": "babylonjs-loaders",
     "description": "The Babylon.js file loaders library is an extension you can use to load different 3D file types into a Babylon scene.",
-    "version": "3.1.0-beta3",
+    "version": "3.1.0-beta5",
     "repository": {
         "type": "git",
         "url": "https://github.com/BabylonJS/Babylon.js.git"

dist/preview release/materialsLibrary/package.json

@@ -4,7 +4,7 @@
     },
     "name": "babylonjs-materials",
     "description": "The Babylon.js materials library is a collection of advanced materials to be used in a Babylon.js scene.",
-    "version": "3.1.0-beta3",
+    "version": "3.1.0-beta5",
     "repository": {
         "type": "git",
         "url": "https://github.com/BabylonJS/Babylon.js.git"

dist/preview release/postProcessesLibrary/package.json

@@ -4,7 +4,7 @@
     },
     "name": "babylonjs-post-process",
     "description": "The Babylon.js materials library is a collection of advanced materials to be used in a Babylon.js scene.",
-    "version": "3.1.0-beta3",
+    "version": "3.1.0-beta5",
     "repository": {
         "type": "git",
         "url": "https://github.com/BabylonJS/Babylon.js.git"

dist/preview release/proceduralTexturesLibrary/package.json

@@ -4,7 +4,7 @@
     },
     "name": "babylonjs-procedural-textures",
     "description": "The Babylon.js materials library is a collection of advanced materials to be used in a Babylon.js scene.",
-    "version": "3.1.0-beta3",
+    "version": "3.1.0-beta5",
     "repository": {
         "type": "git",
         "url": "https://github.com/BabylonJS/Babylon.js.git"

dist/preview release/serializers/package.json

@@ -4,7 +4,7 @@
     },
     "name": "babylonjs-serializers",
     "description": "The Babylon.js serializers library is an extension you can use to serialize Babylon scenes.",
-    "version": "3.1.0-beta3",
+    "version": "3.1.0-beta5",
     "repository": {
         "type": "git",
         "url": "https://github.com/BabylonJS/Babylon.js.git"

package.json

@@ -8,7 +8,7 @@
     ],
     "name": "babylonjs",
     "description": "Babylon.js is a JavaScript 3D engine based on webgl.",
-    "version": "3.1.0-beta3",
+    "version": "3.1.0-beta5",
     "repository": {
         "type": "git",
         "url": "https://github.com/BabylonJS/Babylon.js.git"