Fix inspector closing issue

dist/preview release/babylon.max.js

@@ -108949,6 +108949,10 @@ var BABYLON;
              * If the gaze trackers scale should be updated to be constant size when pointing at near/far meshes
              */
             this.updateGazeTrackerScale = true;
+            /**
+             * If the gaze trackers color should be updated when selecting meshes
+             */
+            this.updateGazeTrackerColor = true;
             this._onResize = function () {
                 _this.moveButtonToBottomRight();
                 if (_this._fullscreenVRpresenting && _this._webVRready) {
@@ -110369,6 +110373,9 @@ var BABYLON;
          * @param color new color for the ray.
          */
         VRExperienceHelper.prototype.changeGazeColor = function (color) {
+            if (!this.updateGazeTrackerColor) {
+                return;
+            }
             if (!this._cameraGazer._gazeTracker.material) {
                 return;
             }

dist/preview release/babylon.no-module.max.js

@@ -108916,6 +108916,10 @@ var BABYLON;
              * If the gaze trackers scale should be updated to be constant size when pointing at near/far meshes
              */
             this.updateGazeTrackerScale = true;
+            /**
+             * If the gaze trackers color should be updated when selecting meshes
+             */
+            this.updateGazeTrackerColor = true;
             this._onResize = function () {
                 _this.moveButtonToBottomRight();
                 if (_this._fullscreenVRpresenting && _this._webVRready) {
@@ -110336,6 +110340,9 @@ var BABYLON;
          * @param color new color for the ray.
          */
         VRExperienceHelper.prototype.changeGazeColor = function (color) {
+            if (!this.updateGazeTrackerColor) {
+                return;
+            }
             if (!this._cameraGazer._gazeTracker.material) {
                 return;
             }

dist/preview release/es6.js

@@ -108916,6 +108916,10 @@ var BABYLON;
              * If the gaze trackers scale should be updated to be constant size when pointing at near/far meshes
              */
             this.updateGazeTrackerScale = true;
+            /**
+             * If the gaze trackers color should be updated when selecting meshes
+             */
+            this.updateGazeTrackerColor = true;
             this._onResize = function () {
                 _this.moveButtonToBottomRight();
                 if (_this._fullscreenVRpresenting && _this._webVRready) {
@@ -110336,6 +110340,9 @@ var BABYLON;
          * @param color new color for the ray.
          */
         VRExperienceHelper.prototype.changeGazeColor = function (color) {
+            if (!this.updateGazeTrackerColor) {
+                return;
+            }
             if (!this._cameraGazer._gazeTracker.material) {
                 return;
             }

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

@@ -924,7 +924,7 @@ declare module BabylonViewer {
       * @param name the name of the custom optimizer configuration
       * @param upgrade set to true if you want to upgrade optimizer and false if you want to degrade
       */
-    export function getCustomOptimizerByName(name: string, upgrade?: boolean): typeof extendedUpgrade;
+    export function getCustomOptimizerByName(name: string, upgrade?: boolean): (sceneManager: SceneManager) => boolean;
     export function registerCustomOptimizer(name: string, optimizer: (sceneManager: SceneManager) => boolean): void;
 }
 declare module BabylonViewer {
@@ -1558,20 +1558,6 @@ declare module BabylonViewer {
     export function addLoaderPlugin(name: string, plugin: ILoaderPlugin): void;
 }
 declare module BabylonViewer {
-    /**
-        * A custom upgrade-oriented function configuration for the scene optimizer.
-        *
-        * @param viewer the viewer to optimize
-        */
-    export function extendedUpgrade(sceneManager: SceneManager): boolean;
-    /**
-        * A custom degrade-oriented function configuration for the scene optimizer.
-        *
-        * @param viewer the viewer to optimize
-        */
-    export function extendedDegrade(sceneManager: SceneManager): boolean;
-}
-declare module BabylonViewer {
 }
 declare module BabylonViewer {
     export interface IEnvironmentMapConfiguration {

dist/preview release/viewer/babylon.viewer.module.d.ts

@@ -985,14 +985,13 @@ declare module 'babylonjs-viewer/templating/viewerTemplatePlugin' {
 }
 
 declare module 'babylonjs-viewer/optimizer/custom' {
-    import { extendedUpgrade } from "babylonjs-viewer/optimizer/custom/extended";
     import { SceneManager } from "babylonjs-viewer/managers/sceneManager";
     /**
       *
       * @param name the name of the custom optimizer configuration
       * @param upgrade set to true if you want to upgrade optimizer and false if you want to degrade
       */
-    export function getCustomOptimizerByName(name: string, upgrade?: boolean): typeof extendedUpgrade;
+    export function getCustomOptimizerByName(name: string, upgrade?: boolean): (sceneManager: SceneManager) => boolean;
     export function registerCustomOptimizer(name: string, optimizer: (sceneManager: SceneManager) => boolean): void;
 }
 
@@ -1663,22 +1662,6 @@ declare module 'babylonjs-viewer/loader/plugins' {
     export function addLoaderPlugin(name: string, plugin: ILoaderPlugin): void;
 }
 
-declare module 'babylonjs-viewer/optimizer/custom/extended' {
-    import { SceneManager } from 'babylonjs-viewer/managers/sceneManager';
-    /**
-        * A custom upgrade-oriented function configuration for the scene optimizer.
-        *
-        * @param viewer the viewer to optimize
-        */
-    export function extendedUpgrade(sceneManager: SceneManager): boolean;
-    /**
-        * A custom degrade-oriented function configuration for the scene optimizer.
-        *
-        * @param viewer the viewer to optimize
-        */
-    export function extendedDegrade(sceneManager: SceneManager): boolean;
-}
-
 declare module 'babylonjs-viewer/configuration/interfaces' {
     export * from 'babylonjs-viewer/configuration/interfaces/cameraConfiguration';
     export * from 'babylonjs-viewer/configuration/interfaces/colorGradingConfiguration';

inspector/src/inspector.ts

@@ -69,7 +69,7 @@ export class Inspector {
                 embedMode: options.embedMode,
                 handleResize: options.handleResize,
                 enablePopup: options.enablePopup,
-                enableClose: options.enablePopup,
+                enableClose: options.enableClose,
                 explorerExtensibility: options.explorerExtensibility
             };
         }
@@ -432,11 +432,15 @@ export class Inspector {
     }
 
     private static _Cleanup() {
+        if (Inspector._OpenedPane !== 0) {
+            return;
+        }
+
         if (this._NewCanvasContainer) {
             this._DestroyCanvasContainer();
         }
 
-        if (Inspector._OpenedPane === 0 && this._OnBeforeRenderObserver && this._Scene) {
+        if (this._OnBeforeRenderObserver && this._Scene) {
             this._Scene.onBeforeRenderObservable.remove(this._OnBeforeRenderObserver);
             this._OnBeforeRenderObserver = null;