Fix Merge Imports

src/Bones/bone.ts

@@ -6,6 +6,7 @@ import { Nullable } from "types";
 import { Animation } from "Animations/animation";
 import { AnimationPropertiesOverride } from "Animations/animationPropertiesOverride";
 import { AbstractMesh } from "Meshes/abstractMesh";
+import { TransformNode } from "Meshes/transformNode";
 import { Node } from "node";
 
     /**

src/Debug/axesViewer.ts

@@ -1,8 +1,9 @@
-import { Vector3, Color3 } from "Maths/math";
+import { Vector3, Color3, Quaternion } from "Maths/math";
 import { Nullable } from "types";
 import { Scene } from "scene";
-import { Mesh } from "Meshes/mesh";
-import { LinesMesh } from "Meshes/linesMesh";
+import { AbstractMesh } from "Meshes/AbstractMesh";
+import { StandardMaterial } from "Materials/standardMaterial";
+import { AxisDragGizmo } from "Gizmos/axisDragGizmo";
 
 /**
      * The Axes viewer will show 3 axes in a specific point in space
@@ -51,27 +52,27 @@ import { LinesMesh } from "Meshes/linesMesh";
         constructor(scene: Scene, scaleLines = 1) {
             this.scaleLines = scaleLines;
 
-            var greenColoredMaterial = new BABYLON.StandardMaterial("", scene);
+            var greenColoredMaterial = new StandardMaterial("", scene);
             greenColoredMaterial.disableLighting = true;
-            greenColoredMaterial.emissiveColor = BABYLON.Color3.Green().scale(0.5);
+            greenColoredMaterial.emissiveColor = Color3.Green().scale(0.5);
 
-            var redColoredMaterial = new BABYLON.StandardMaterial("", scene);
+            var redColoredMaterial = new StandardMaterial("", scene);
             redColoredMaterial.disableLighting = true;
-            redColoredMaterial.emissiveColor = BABYLON.Color3.Red().scale(0.5);
+            redColoredMaterial.emissiveColor = Color3.Red().scale(0.5);
 
-            var blueColoredMaterial = new BABYLON.StandardMaterial("", scene);
+            var blueColoredMaterial = new StandardMaterial("", scene);
             blueColoredMaterial.disableLighting = true;
-            blueColoredMaterial.emissiveColor = BABYLON.Color3.Blue().scale(0.5);
+            blueColoredMaterial.emissiveColor = Color3.Blue().scale(0.5);
 
-            this._xmesh = BABYLON.AxisDragGizmo._CreateArrow(scene, redColoredMaterial);
-            this._ymesh = BABYLON.AxisDragGizmo._CreateArrow(scene, greenColoredMaterial);
-            this._zmesh = BABYLON.AxisDragGizmo._CreateArrow(scene, blueColoredMaterial);
+            this._xmesh = AxisDragGizmo._CreateArrow(scene, redColoredMaterial);
+            this._ymesh = AxisDragGizmo._CreateArrow(scene, greenColoredMaterial);
+            this._zmesh = AxisDragGizmo._CreateArrow(scene, blueColoredMaterial);
 
-            this._xmesh.rotationQuaternion = new BABYLON.Quaternion();
+            this._xmesh.rotationQuaternion = new Quaternion();
             this._xmesh.scaling.scaleInPlace(4);
-            this._ymesh.rotationQuaternion = new BABYLON.Quaternion();
+            this._ymesh.rotationQuaternion = new Quaternion();
             this._ymesh.scaling.scaleInPlace(4);
-            this._zmesh.rotationQuaternion = new BABYLON.Quaternion();
+            this._zmesh.rotationQuaternion = new Quaternion();
             this._zmesh.scaling.scaleInPlace(4);
 
             AxesViewer._recursiveChangeRenderingGroupId(this._xmesh, 2);
@@ -79,7 +80,7 @@ import { LinesMesh } from "Meshes/linesMesh";
             AxesViewer._recursiveChangeRenderingGroupId(this._zmesh, 2);
 
             this.scene = scene;
-            this.update(new BABYLON.Vector3(), Vector3.Right(), Vector3.Up(), Vector3.Forward());
+            this.update(new Vector3(), Vector3.Right(), Vector3.Up(), Vector3.Forward());
         }
 
         /**

src/Debug/physicsViewer.ts

@@ -3,12 +3,13 @@ import { Scene } from "scene";
 import { AbstractMesh } from "Meshes/abstractMesh";
 import { Mesh } from "Meshes/mesh";
 import { MeshBuilder } from "Meshes/meshBuilder";
-import { Quaternion } from "Maths/math";
+import { Quaternion, Color3 } from "Maths/math";
 import { Material } from "Materials/material";
 import { Engine } from "Engines/engine";
 import { StandardMaterial } from "Materials/standardMaterial";
 import { IPhysicsEnginePlugin } from "Physics/IPhysicsEngine";
 import { PhysicsImpostor } from "Physics/physicsImpostor";
+import { UtilityLayerRenderer } from "Rendering/utilityLayerRenderer";
 
 /**
      * Used to show the physics impostor around the specific mesh

src/Gizmos/gizmoManager.ts

@@ -1,4 +1,4 @@
-import { Observer } from "Misc/observable";
+import { Observer, Observable } from "Misc/observable";
 import { Nullable } from "types";
 import { PointerInfo, PointerEventTypes } from "Events/pointerEvents";
 import { Scene, IDisposable } from "scene";

src/Materials/Textures/hdrCubeTexture.ts

@@ -294,7 +294,7 @@ import { CubeMapToSphericalPolynomialTools } from "Misc/HighDynamicRange/cubemap
             }
 
             if (value.isIdentity() !== this._textureMatrix.isIdentity()) {
-                this.getScene()!.markAllMaterialsAsDirty(Material.TextureDirtyFlag, (mat) => mat.getActiveTextures().indexOf(this) !== -1);
+                this.getScene()!.markAllMaterialsAsDirty(Constants.MATERIAL_TextureDirtyFlag, (mat) => mat.getActiveTextures().indexOf(this) !== -1);
             }
         }
 

src/Meshes/abstractMesh.ts

@@ -1,6 +1,6 @@
 import { Tools } from "Misc/tools";
 import { Observer, Observable } from "Misc/observable";
-import { Nullable, FloatArray, IndicesArray } from "types";
+import { Nullable, FloatArray, IndicesArray, DeepImmutable } from "types";
 import { Camera } from "Cameras/camera";
 import { Scene, IDisposable } from "scene";
 import { Quaternion, Matrix, Vector3, Color3, Color4, Plane, Tmp, Epsilon, Axis, Vector2 } from "Maths/math";

src/Meshes/subMesh.ts

@@ -1,5 +1,5 @@
 import { Tools } from "Misc/tools";
-import { Nullable, IndicesArray } from "types";
+import { Nullable, IndicesArray, DeepImmutable } from "types";
 import { Matrix, Vector3, Plane } from "Maths/math";
 import { Engine } from "Engines/engine";
 import { VertexBuffer } from "./buffer";