PP bug

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;
@@ -71525,6 +71519,7 @@ var BABYLON;
                 if (!this._webVRpresenting) {
                     this._webVRCamera.position = this._position;
                     this._scene.activeCamera = this._webVRCamera;
+                    this._scene.imageProcessingConfiguration.applyByPostProcess = true;
                 }
             }
             else {
@@ -71556,6 +71551,7 @@ var BABYLON;
                 this._scene.activeCamera.attachControl(this._canvas);
             }
             this.updateButtonVisibility();
+            this._scene.imageProcessingConfiguration.applyByPostProcess = false;
         };
         Object.defineProperty(VRExperienceHelper.prototype, "position", {
             get: function () {
@@ -71591,6 +71587,8 @@ var BABYLON;
             this._postProcessMove.vignetteColor = new BABYLON.Color4(0, 0, 0, 0);
             this._postProcessMove.vignetteEnabled = false;
             new BABYLON.PassPostProcess("pass", 1.0, this._webVRCamera);
+            this._postProcessMove.imageProcessingConfiguration = new BABYLON.ImageProcessingConfiguration();
+            this._scene.imageProcessingConfiguration.applyByPostProcess = false;
             this._createTeleportationCircles();
             this.meshSelectionPredicate = function (mesh) {
                 if (mesh.name.indexOf(_this._floorMeshName) !== -1) {

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;
@@ -71371,6 +71365,7 @@ var BABYLON;
                 if (!this._webVRpresenting) {
                     this._webVRCamera.position = this._position;
                     this._scene.activeCamera = this._webVRCamera;
+                    this._scene.imageProcessingConfiguration.applyByPostProcess = true;
                 }
             }
             else {
@@ -71402,6 +71397,7 @@ var BABYLON;
                 this._scene.activeCamera.attachControl(this._canvas);
             }
             this.updateButtonVisibility();
+            this._scene.imageProcessingConfiguration.applyByPostProcess = false;
         };
         Object.defineProperty(VRExperienceHelper.prototype, "position", {
             get: function () {
@@ -71437,6 +71433,8 @@ var BABYLON;
             this._postProcessMove.vignetteColor = new BABYLON.Color4(0, 0, 0, 0);
             this._postProcessMove.vignetteEnabled = false;
             new BABYLON.PassPostProcess("pass", 1.0, this._webVRCamera);
+            this._postProcessMove.imageProcessingConfiguration = new BABYLON.ImageProcessingConfiguration();
+            this._scene.imageProcessingConfiguration.applyByPostProcess = false;
             this._createTeleportationCircles();
             this.meshSelectionPredicate = function (mesh) {
                 if (mesh.name.indexOf(_this._floorMeshName) !== -1) {
@@ -80907,11 +80905,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/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/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