Nightly #2

dist/preview release/babylon.max.js

@@ -72241,7 +72241,12 @@ var BABYLON;
                 }
                 if (this._btnVR) {
                     this._btnVR.addEventListener("click", function () {
-                        _this.enterVR();
+                        if (!_this.isInVRMode) {
+                            _this.enterVR();
+                        }
+                        else {
+                            _this.exitVR();
+                        }
                     });
                 }
                 window.addEventListener("resize", function () {
@@ -72456,7 +72461,7 @@ var BABYLON;
             this.updateButtonVisibility();
         };
         VRExperienceHelper.prototype.updateButtonVisibility = function () {
-            if (!this._btnVR) {
+            if (!this._btnVR || this._useCustomVRButton) {
                 return;
             }
             this._btnVR.className = "babylonVRicon";

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

@@ -72087,7 +72087,12 @@ var BABYLON;
                 }
                 if (this._btnVR) {
                     this._btnVR.addEventListener("click", function () {
-                        _this.enterVR();
+                        if (!_this.isInVRMode) {
+                            _this.enterVR();
+                        }
+                        else {
+                            _this.exitVR();
+                        }
                     });
                 }
                 window.addEventListener("resize", function () {
@@ -72302,7 +72307,7 @@ var BABYLON;
             this.updateButtonVisibility();
         };
         VRExperienceHelper.prototype.updateButtonVisibility = function () {
-            if (!this._btnVR) {
+            if (!this._btnVR || this._useCustomVRButton) {
                 return;
             }
             this._btnVR.className = "babylonVRicon";
@@ -83716,7 +83721,7 @@ var BABYLON;
                             }
                         }
                     }
-                    else {
+                    else if (mesh.material) {
                         remaining++;
                     }
                 }
@@ -83738,7 +83743,7 @@ var BABYLON;
                             }
                         }
                     }
-                    else if (mesh.material !== null) {
+                    else if (mesh.material) {
                         this._compileMaterialAsync(mesh.material, mesh, function () {
                             if (--remaining === 0) {
                                 onSuccess();

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

@@ -1877,7 +1877,7 @@ var BABYLON;
                             }
                         }
                     }
-                    else {
+                    else if (mesh.material) {
                         remaining++;
                     }
                 }
@@ -1899,7 +1899,7 @@ var BABYLON;
                             }
                         }
                     }
-                    else if (mesh.material !== null) {
+                    else if (mesh.material) {
                         this._compileMaterialAsync(mesh.material, mesh, function () {
                             if (--remaining === 0) {
                                 onSuccess();

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

@@ -4033,7 +4033,7 @@ var BABYLON;
                             }
                         }
                     }
-                    else {
+                    else if (mesh.material) {
                         remaining++;
                     }
                 }
@@ -4055,7 +4055,7 @@ var BABYLON;
                             }
                         }
                     }
-                    else if (mesh.material !== null) {
+                    else if (mesh.material) {
                         this._compileMaterialAsync(mesh.material, mesh, function () {
                             if (--remaining === 0) {
                                 onSuccess();

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

@@ -4989,7 +4989,7 @@ var BABYLON;
                             }
                         }
                     }
-                    else {
+                    else if (mesh.material) {
                         remaining++;
                     }
                 }
@@ -5011,7 +5011,7 @@ var BABYLON;
                             }
                         }
                     }
-                    else if (mesh.material !== null) {
+                    else if (mesh.material) {
                         this._compileMaterialAsync(mesh.material, mesh, function () {
                             if (--remaining === 0) {
                                 onSuccess();