Nightly

dist/preview release/babylon.max.js

@@ -24398,6 +24398,7 @@ var BABYLON;
              */
             _this.animationTimeScale = 1;
             _this._renderId = 0;
+            _this._frameId = 0;
             _this._executeWhenReadyTimeoutId = -1;
             _this._intermediateRendering = false;
             _this._viewUpdateFlag = -1;
@@ -25252,12 +25253,19 @@ var BABYLON;
             return this._animationRatio !== undefined ? this._animationRatio : 1;
         };
         /**
-         * Gets an unique Id for the current frame
+         * Gets an unique Id for the current render phase
          * @returns a number
          */
         Scene.prototype.getRenderId = function () {
             return this._renderId;
         };
+        /**
+         * Gets an unique Id for the current frame
+         * @returns a number
+         */
+        Scene.prototype.getFrameId = function () {
+            return this._frameId;
+        };
         /** Call this function if you want to manually increment the render Id*/
         Scene.prototype.incrementRenderId = function () {
             this._renderId++;
@@ -27412,7 +27420,7 @@ var BABYLON;
                 var material = subMesh.getMaterial();
                 if (material !== null && material !== undefined) {
                     // Render targets
-                    if (material.getRenderTargetTextures !== undefined) {
+                    if (material.hasRenderTargetTextures && material.getRenderTargetTextures !== undefined) {
                         if (this._processedMaterials.indexOf(material) === -1) {
                             this._processedMaterials.push(material);
                             this._renderTargets.concatWithNoDuplicate(material.getRenderTargetTextures());
@@ -27563,7 +27571,7 @@ var BABYLON;
             }
         };
         Scene.prototype._activeMesh = function (sourceMesh, mesh) {
-            if (this.skeletonsEnabled && mesh.skeleton !== null && mesh.skeleton !== undefined) {
+            if (this._skeletonsEnabled && mesh.skeleton !== null && mesh.skeleton !== undefined) {
                 if (this._activeSkeletons.pushNoDuplicate(mesh.skeleton)) {
                     mesh.skeleton.prepare();
                 }
@@ -27747,6 +27755,7 @@ var BABYLON;
             if (this.isDisposed) {
                 return;
             }
+            this._frameId++;
             // Register components that have been associated lately to the scene.
             this._registerTransientComponents();
             this._activeParticles.fetchNewFrame();
@@ -31668,7 +31677,8 @@ var BABYLON;
             }
             var data = this._getPositionData(applySkeleton);
             if (data) {
-                var extend = BABYLON.Tools.ExtractMinAndMax(data, 0, this.getTotalVertices());
+                var bias = this.geometry ? this.geometry.boundingBias : null;
+                var extend = BABYLON.Tools.ExtractMinAndMax(data, 0, this.getTotalVertices(), bias);
                 this._boundingInfo = new BABYLON.BoundingInfo(extend.minimum, extend.maximum);
             }
             if (this.subMeshes) {
@@ -33821,10 +33831,10 @@ var BABYLON;
             if (!this.geometry) {
                 return this;
             }
-            if (this.geometry._softwareSkinningRenderId == this.getScene().getRenderId()) {
+            if (this.geometry._softwareSkinningFrameId == this.getScene().getFrameId()) {
                 return this;
             }
-            this.geometry._softwareSkinningRenderId = this.getScene().getRenderId();
+            this.geometry._softwareSkinningFrameId = this.getScene().getFrameId();
             if (!this.isVerticesDataPresent(BABYLON.VertexBuffer.PositionKind)) {
                 return this;
             }
@@ -34619,6 +34629,10 @@ var BABYLON;
              */
             this._backFaceCulling = true;
             /**
+             * Gets a boolean indicating that current material needs to register RTT
+             */
+            this.hasRenderTargetTextures = false;
+            /**
              * Specifies if the material should be serialized
              */
             this.doNotSerialize = false;
@@ -41845,6 +41859,22 @@ var BABYLON;
             enumerable: true,
             configurable: true
         });
+        Object.defineProperty(StandardMaterial.prototype, "hasRenderTargetTextures", {
+            /**
+             * Gets a boolean indicating that current material needs to register RTT
+             */
+            get: function () {
+                if (StandardMaterial.ReflectionTextureEnabled && this._reflectionTexture && this._reflectionTexture.isRenderTarget) {
+                    return true;
+                }
+                if (StandardMaterial.RefractionTextureEnabled && this._refractionTexture && this._refractionTexture.isRenderTarget) {
+                    return true;
+                }
+                return false;
+            },
+            enumerable: true,
+            configurable: true
+        });
         StandardMaterial.prototype.getClassName = function () {
             return "StandardMaterial";
         };
@@ -43846,6 +43876,22 @@ var BABYLON;
                 });
             }
         };
+        Object.defineProperty(PBRBaseMaterial.prototype, "hasRenderTargetTextures", {
+            /**
+             * Gets a boolean indicating that current material needs to register RTT
+             */
+            get: function () {
+                if (BABYLON.StandardMaterial.ReflectionTextureEnabled && this._reflectionTexture && this._reflectionTexture.isRenderTarget) {
+                    return true;
+                }
+                if (BABYLON.StandardMaterial.RefractionTextureEnabled && this._refractionTexture && this._refractionTexture.isRenderTarget) {
+                    return true;
+                }
+                return false;
+            },
+            enumerable: true,
+            configurable: true
+        });
         /**
          * Gets the name of the material class.
          */
@@ -107423,6 +107469,22 @@ var BABYLON;
             enumerable: true,
             configurable: true
         });
+        Object.defineProperty(BackgroundMaterial.prototype, "hasRenderTargetTextures", {
+            /**
+             * Gets a boolean indicating that current material needs to register RTT
+             */
+            get: function () {
+                if (this._diffuseTexture && this._diffuseTexture.isRenderTarget) {
+                    return true;
+                }
+                if (this._reflectionTexture && this._reflectionTexture.isRenderTarget) {
+                    return true;
+                }
+                return false;
+            },
+            enumerable: true,
+            configurable: true
+        });
         /**
          * The entire material has been created in order to prevent overdraw.
          * @returns false

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

@@ -24365,6 +24365,7 @@ var BABYLON;
              */
             _this.animationTimeScale = 1;
             _this._renderId = 0;
+            _this._frameId = 0;
             _this._executeWhenReadyTimeoutId = -1;
             _this._intermediateRendering = false;
             _this._viewUpdateFlag = -1;
@@ -25219,12 +25220,19 @@ var BABYLON;
             return this._animationRatio !== undefined ? this._animationRatio : 1;
         };
         /**
-         * Gets an unique Id for the current frame
+         * Gets an unique Id for the current render phase
          * @returns a number
          */
         Scene.prototype.getRenderId = function () {
             return this._renderId;
         };
+        /**
+         * Gets an unique Id for the current frame
+         * @returns a number
+         */
+        Scene.prototype.getFrameId = function () {
+            return this._frameId;
+        };
         /** Call this function if you want to manually increment the render Id*/
         Scene.prototype.incrementRenderId = function () {
             this._renderId++;
@@ -27379,7 +27387,7 @@ var BABYLON;
                 var material = subMesh.getMaterial();
                 if (material !== null && material !== undefined) {
                     // Render targets
-                    if (material.getRenderTargetTextures !== undefined) {
+                    if (material.hasRenderTargetTextures && material.getRenderTargetTextures !== undefined) {
                         if (this._processedMaterials.indexOf(material) === -1) {
                             this._processedMaterials.push(material);
                             this._renderTargets.concatWithNoDuplicate(material.getRenderTargetTextures());
@@ -27530,7 +27538,7 @@ var BABYLON;
             }
         };
         Scene.prototype._activeMesh = function (sourceMesh, mesh) {
-            if (this.skeletonsEnabled && mesh.skeleton !== null && mesh.skeleton !== undefined) {
+            if (this._skeletonsEnabled && mesh.skeleton !== null && mesh.skeleton !== undefined) {
                 if (this._activeSkeletons.pushNoDuplicate(mesh.skeleton)) {
                     mesh.skeleton.prepare();
                 }
@@ -27714,6 +27722,7 @@ var BABYLON;
             if (this.isDisposed) {
                 return;
             }
+            this._frameId++;
             // Register components that have been associated lately to the scene.
             this._registerTransientComponents();
             this._activeParticles.fetchNewFrame();
@@ -31635,7 +31644,8 @@ var BABYLON;
             }
             var data = this._getPositionData(applySkeleton);
             if (data) {
-                var extend = BABYLON.Tools.ExtractMinAndMax(data, 0, this.getTotalVertices());
+                var bias = this.geometry ? this.geometry.boundingBias : null;
+                var extend = BABYLON.Tools.ExtractMinAndMax(data, 0, this.getTotalVertices(), bias);
                 this._boundingInfo = new BABYLON.BoundingInfo(extend.minimum, extend.maximum);
             }
             if (this.subMeshes) {
@@ -33788,10 +33798,10 @@ var BABYLON;
             if (!this.geometry) {
                 return this;
             }
-            if (this.geometry._softwareSkinningRenderId == this.getScene().getRenderId()) {
+            if (this.geometry._softwareSkinningFrameId == this.getScene().getFrameId()) {
                 return this;
             }
-            this.geometry._softwareSkinningRenderId = this.getScene().getRenderId();
+            this.geometry._softwareSkinningFrameId = this.getScene().getFrameId();
             if (!this.isVerticesDataPresent(BABYLON.VertexBuffer.PositionKind)) {
                 return this;
             }
@@ -34586,6 +34596,10 @@ var BABYLON;
              */
             this._backFaceCulling = true;
             /**
+             * Gets a boolean indicating that current material needs to register RTT
+             */
+            this.hasRenderTargetTextures = false;
+            /**
              * Specifies if the material should be serialized
              */
             this.doNotSerialize = false;
@@ -41812,6 +41826,22 @@ var BABYLON;
             enumerable: true,
             configurable: true
         });
+        Object.defineProperty(StandardMaterial.prototype, "hasRenderTargetTextures", {
+            /**
+             * Gets a boolean indicating that current material needs to register RTT
+             */
+            get: function () {
+                if (StandardMaterial.ReflectionTextureEnabled && this._reflectionTexture && this._reflectionTexture.isRenderTarget) {
+                    return true;
+                }
+                if (StandardMaterial.RefractionTextureEnabled && this._refractionTexture && this._refractionTexture.isRenderTarget) {
+                    return true;
+                }
+                return false;
+            },
+            enumerable: true,
+            configurable: true
+        });
         StandardMaterial.prototype.getClassName = function () {
             return "StandardMaterial";
         };
@@ -43813,6 +43843,22 @@ var BABYLON;
                 });
             }
         };
+        Object.defineProperty(PBRBaseMaterial.prototype, "hasRenderTargetTextures", {
+            /**
+             * Gets a boolean indicating that current material needs to register RTT
+             */
+            get: function () {
+                if (BABYLON.StandardMaterial.ReflectionTextureEnabled && this._reflectionTexture && this._reflectionTexture.isRenderTarget) {
+                    return true;
+                }
+                if (BABYLON.StandardMaterial.RefractionTextureEnabled && this._refractionTexture && this._refractionTexture.isRenderTarget) {
+                    return true;
+                }
+                return false;
+            },
+            enumerable: true,
+            configurable: true
+        });
         /**
          * Gets the name of the material class.
          */
@@ -107390,6 +107436,22 @@ var BABYLON;
             enumerable: true,
             configurable: true
         });
+        Object.defineProperty(BackgroundMaterial.prototype, "hasRenderTargetTextures", {
+            /**
+             * Gets a boolean indicating that current material needs to register RTT
+             */
+            get: function () {
+                if (this._diffuseTexture && this._diffuseTexture.isRenderTarget) {
+                    return true;
+                }
+                if (this._reflectionTexture && this._reflectionTexture.isRenderTarget) {
+                    return true;
+                }
+                return false;
+            },
+            enumerable: true,
+            configurable: true
+        });
         /**
          * The entire material has been created in order to prevent overdraw.
          * @returns false

dist/preview release/es6.js

@@ -24365,6 +24365,7 @@ var BABYLON;
              */
             _this.animationTimeScale = 1;
             _this._renderId = 0;
+            _this._frameId = 0;
             _this._executeWhenReadyTimeoutId = -1;
             _this._intermediateRendering = false;
             _this._viewUpdateFlag = -1;
@@ -25219,12 +25220,19 @@ var BABYLON;
             return this._animationRatio !== undefined ? this._animationRatio : 1;
         };
         /**
-         * Gets an unique Id for the current frame
+         * Gets an unique Id for the current render phase
          * @returns a number
          */
         Scene.prototype.getRenderId = function () {
             return this._renderId;
         };
+        /**
+         * Gets an unique Id for the current frame
+         * @returns a number
+         */
+        Scene.prototype.getFrameId = function () {
+            return this._frameId;
+        };
         /** Call this function if you want to manually increment the render Id*/
         Scene.prototype.incrementRenderId = function () {
             this._renderId++;
@@ -27379,7 +27387,7 @@ var BABYLON;
                 var material = subMesh.getMaterial();
                 if (material !== null && material !== undefined) {
                     // Render targets
-                    if (material.getRenderTargetTextures !== undefined) {
+                    if (material.hasRenderTargetTextures && material.getRenderTargetTextures !== undefined) {
                         if (this._processedMaterials.indexOf(material) === -1) {
                             this._processedMaterials.push(material);
                             this._renderTargets.concatWithNoDuplicate(material.getRenderTargetTextures());
@@ -27530,7 +27538,7 @@ var BABYLON;
             }
         };
         Scene.prototype._activeMesh = function (sourceMesh, mesh) {
-            if (this.skeletonsEnabled && mesh.skeleton !== null && mesh.skeleton !== undefined) {
+            if (this._skeletonsEnabled && mesh.skeleton !== null && mesh.skeleton !== undefined) {
                 if (this._activeSkeletons.pushNoDuplicate(mesh.skeleton)) {
                     mesh.skeleton.prepare();
                 }
@@ -27714,6 +27722,7 @@ var BABYLON;
             if (this.isDisposed) {
                 return;
             }
+            this._frameId++;
             // Register components that have been associated lately to the scene.
             this._registerTransientComponents();
             this._activeParticles.fetchNewFrame();
@@ -31635,7 +31644,8 @@ var BABYLON;
             }
             var data = this._getPositionData(applySkeleton);
             if (data) {
-                var extend = BABYLON.Tools.ExtractMinAndMax(data, 0, this.getTotalVertices());
+                var bias = this.geometry ? this.geometry.boundingBias : null;
+                var extend = BABYLON.Tools.ExtractMinAndMax(data, 0, this.getTotalVertices(), bias);
                 this._boundingInfo = new BABYLON.BoundingInfo(extend.minimum, extend.maximum);
             }
             if (this.subMeshes) {
@@ -33788,10 +33798,10 @@ var BABYLON;
             if (!this.geometry) {
                 return this;
             }
-            if (this.geometry._softwareSkinningRenderId == this.getScene().getRenderId()) {
+            if (this.geometry._softwareSkinningFrameId == this.getScene().getFrameId()) {
                 return this;
             }
-            this.geometry._softwareSkinningRenderId = this.getScene().getRenderId();
+            this.geometry._softwareSkinningFrameId = this.getScene().getFrameId();
             if (!this.isVerticesDataPresent(BABYLON.VertexBuffer.PositionKind)) {
                 return this;
             }
@@ -34586,6 +34596,10 @@ var BABYLON;
              */
             this._backFaceCulling = true;
             /**
+             * Gets a boolean indicating that current material needs to register RTT
+             */
+            this.hasRenderTargetTextures = false;
+            /**
              * Specifies if the material should be serialized
              */
             this.doNotSerialize = false;
@@ -41812,6 +41826,22 @@ var BABYLON;
             enumerable: true,
             configurable: true
         });
+        Object.defineProperty(StandardMaterial.prototype, "hasRenderTargetTextures", {
+            /**
+             * Gets a boolean indicating that current material needs to register RTT
+             */
+            get: function () {
+                if (StandardMaterial.ReflectionTextureEnabled && this._reflectionTexture && this._reflectionTexture.isRenderTarget) {
+                    return true;
+                }
+                if (StandardMaterial.RefractionTextureEnabled && this._refractionTexture && this._refractionTexture.isRenderTarget) {
+                    return true;
+                }
+                return false;
+            },
+            enumerable: true,
+            configurable: true
+        });
         StandardMaterial.prototype.getClassName = function () {
             return "StandardMaterial";
         };
@@ -43813,6 +43843,22 @@ var BABYLON;
                 });
             }
         };
+        Object.defineProperty(PBRBaseMaterial.prototype, "hasRenderTargetTextures", {
+            /**
+             * Gets a boolean indicating that current material needs to register RTT
+             */
+            get: function () {
+                if (BABYLON.StandardMaterial.ReflectionTextureEnabled && this._reflectionTexture && this._reflectionTexture.isRenderTarget) {
+                    return true;
+                }
+                if (BABYLON.StandardMaterial.RefractionTextureEnabled && this._refractionTexture && this._refractionTexture.isRenderTarget) {
+                    return true;
+                }
+                return false;
+            },
+            enumerable: true,
+            configurable: true
+        });
         /**
          * Gets the name of the material class.
          */
@@ -107390,6 +107436,22 @@ var BABYLON;
             enumerable: true,
             configurable: true
         });
+        Object.defineProperty(BackgroundMaterial.prototype, "hasRenderTargetTextures", {
+            /**
+             * Gets a boolean indicating that current material needs to register RTT
+             */
+            get: function () {
+                if (this._diffuseTexture && this._diffuseTexture.isRenderTarget) {
+                    return true;
+                }
+                if (this._reflectionTexture && this._reflectionTexture.isRenderTarget) {
+                    return true;
+                }
+                return false;
+            },
+            enumerable: true,
+            configurable: true
+        });
         /**
          * The entire material has been created in order to prevent overdraw.
          * @returns false

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

@@ -28,11 +28,10 @@ declare module BABYLON.GUI {
                 */
             processKeyboard(evt: KeyboardEvent): void;
             /**
-                * Function called to let the current focused control keeps the focus
-                * @param pointerId defines the unique id of the current pointer
-                * @returns a boolean indicating if the control wants to keep the focus
+                * Function called to get the list of controls that should not steal the focus from this control
+                * @returns an array of controls
                 */
-            keepFocus(pointerId: number): boolean;
+            keepsFocusWith(): BABYLON.Nullable<Control[]>;
     }
     /**
         * Class used to create texture to support 2D GUI elements
@@ -1086,7 +1085,7 @@ declare module BABYLON.GUI {
                 * @param container defines the container to look for
                 * @returns true if the container is one of the ascendant of the control
                 */
-            IsAscendant(container: Container): boolean;
+            isAscendant(container: Control): boolean;
             /**
                 * Gets coordinates in local control space
                 * @param globalCoordinates defines the coordinates to transform
@@ -1431,11 +1430,10 @@ declare module BABYLON.GUI {
             onFocus(): void;
             protected _getTypeName(): string;
             /**
-                * Function called to let the current focused control keeps the focus
-                * @param pointerId defines the unique id of the current pointer
-                * @returns a boolean indicating if the control wants to keep the focus
+                * Function called to get the list of controls that should not steal the focus from this control
+                * @returns an array of controls
                 */
-            keepFocus(pointerId: number): boolean;
+            keepsFocusWith(): BABYLON.Nullable<Control[]>;
             /** @hidden */
             processKey(keyCode: number, key?: string): void;
             /** @hidden */

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

@@ -71,11 +71,10 @@ declare module 'babylonjs-gui/2D/advancedDynamicTexture' {
                 */
             processKeyboard(evt: KeyboardEvent): void;
             /**
-                * Function called to let the current focused control keeps the focus
-                * @param pointerId defines the unique id of the current pointer
-                * @returns a boolean indicating if the control wants to keep the focus
+                * Function called to get the list of controls that should not steal the focus from this control
+                * @returns an array of controls
                 */
-            keepFocus(pointerId: number): boolean;
+            keepsFocusWith(): Nullable<Control[]>;
     }
     /**
         * Class used to create texture to support 2D GUI elements
@@ -1189,7 +1188,7 @@ declare module 'babylonjs-gui/2D/controls/control' {
                 * @param container defines the container to look for
                 * @returns true if the container is one of the ascendant of the control
                 */
-            IsAscendant(container: Container): boolean;
+            isAscendant(container: Control): boolean;
             /**
                 * Gets coordinates in local control space
                 * @param globalCoordinates defines the coordinates to transform
@@ -1551,11 +1550,10 @@ declare module 'babylonjs-gui/2D/controls/inputText' {
             onFocus(): void;
             protected _getTypeName(): string;
             /**
-                * Function called to let the current focused control keeps the focus
-                * @param pointerId defines the unique id of the current pointer
-                * @returns a boolean indicating if the control wants to keep the focus
+                * Function called to get the list of controls that should not steal the focus from this control
+                * @returns an array of controls
                 */
-            keepFocus(pointerId: number): boolean;
+            keepsFocusWith(): Nullable<Control[]>;
             /** @hidden */
             processKey(keyCode: number, key?: string): void;
             /** @hidden */
@@ -2836,11 +2834,10 @@ declare module BABYLON.GUI {
                 */
             processKeyboard(evt: KeyboardEvent): void;
             /**
-                * Function called to let the current focused control keeps the focus
-                * @param pointerId defines the unique id of the current pointer
-                * @returns a boolean indicating if the control wants to keep the focus
+                * Function called to get the list of controls that should not steal the focus from this control
+                * @returns an array of controls
                 */
-            keepFocus(pointerId: number): boolean;
+            keepsFocusWith(): BABYLON.Nullable<Control[]>;
     }
     /**
         * Class used to create texture to support 2D GUI elements
@@ -3894,7 +3891,7 @@ declare module BABYLON.GUI {
                 * @param container defines the container to look for
                 * @returns true if the container is one of the ascendant of the control
                 */
-            IsAscendant(container: Container): boolean;
+            isAscendant(container: Control): boolean;
             /**
                 * Gets coordinates in local control space
                 * @param globalCoordinates defines the coordinates to transform
@@ -4239,11 +4236,10 @@ declare module BABYLON.GUI {
             onFocus(): void;
             protected _getTypeName(): string;
             /**
-                * Function called to let the current focused control keeps the focus
-                * @param pointerId defines the unique id of the current pointer
-                * @returns a boolean indicating if the control wants to keep the focus
+                * Function called to get the list of controls that should not steal the focus from this control
+                * @returns an array of controls
                 */
-            keepFocus(pointerId: number): boolean;
+            keepsFocusWith(): BABYLON.Nullable<Control[]>;
             /** @hidden */
             processKey(keyCode: number, key?: string): void;
             /** @hidden */

dist/preview release/materialsLibrary/babylon.waterMaterial.js

@@ -127,6 +127,7 @@ var BABYLON;
             _this._lastTime = 0;
             _this._lastDeltaTime = 0;
             _this._createRenderTargets(scene, renderTargetSize);
+            _this.hasRenderTargetTextures = true;
             // Create render targets
             _this.getRenderTargetTextures = function () {
                 _this._renderTargets.reset();

dist/preview release/materialsLibrary/babylonjs.materials.js

@@ -1601,6 +1601,7 @@ var BABYLON;
             _this._lastTime = 0;
             _this._lastDeltaTime = 0;
             _this._createRenderTargets(scene, renderTargetSize);
+            _this.hasRenderTargetTextures = true;
             // Create render targets
             _this.getRenderTargetTextures = function () {
                 _this._renderTargets.reset();

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): (sceneManager: SceneManager) => boolean;
+    export function getCustomOptimizerByName(name: string, upgrade?: boolean): typeof extendedUpgrade;
     export function registerCustomOptimizer(name: string, optimizer: (sceneManager: SceneManager) => boolean): void;
 }
 declare module BabylonViewer {
@@ -1558,6 +1558,20 @@ 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,13 +985,14 @@ 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): (sceneManager: SceneManager) => boolean;
+    export function getCustomOptimizerByName(name: string, upgrade?: boolean): typeof extendedUpgrade;
     export function registerCustomOptimizer(name: string, optimizer: (sceneManager: SceneManager) => boolean): void;
 }
 
@@ -1662,6 +1663,22 @@ 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';

src/babylon.scene.ts

@@ -4160,7 +4160,7 @@
         }
 
         private _activeMesh(sourceMesh: AbstractMesh, mesh: AbstractMesh): void {
-            if (this.skeletonsEnabled && mesh.skeleton !== null && mesh.skeleton !== undefined) {
+            if (this._skeletonsEnabled && mesh.skeleton !== null && mesh.skeleton !== undefined) {
                 if (this._activeSkeletons.pushNoDuplicate(mesh.skeleton)) {
                     mesh.skeleton.prepare();
                 }