Fix Core Merge

src/Gizmos/boundingBoxGizmo.ts

@@ -83,7 +83,7 @@ import { StandardMaterial } from "Materials/standardMaterial";
 
         // Dragging
         private _dragMesh: Nullable<Mesh> = null;
-        private pointerDragBehavior = new BABYLON.PointerDragBehavior();
+        private pointerDragBehavior = new PointerDragBehavior();
 
         // Stores the state of the pivot cache (_oldPivotPoint, _pivotTranslation)
         // store/remove pivot point should only be applied during their outermost calls
@@ -502,9 +502,9 @@ import { StandardMaterial } from "Materials/standardMaterial";
          * Enables a pointer drag behavior on the bounding box of the gizmo
          */
         public enableDragBehavior() {
-            this._dragMesh = BABYLON.Mesh.CreateBox("dummy", 1, this.gizmoLayer.utilityLayerScene);
+            this._dragMesh = Mesh.CreateBox("dummy", 1, this.gizmoLayer.utilityLayerScene);
             this._dragMesh.visibility = 0;
-            this._dragMesh.rotationQuaternion = new BABYLON.Quaternion();
+            this._dragMesh.rotationQuaternion = new Quaternion();
             this.pointerDragBehavior.useObjectOrienationForDragging = false;
             this._dragMesh.addBehavior(this.pointerDragBehavior);
         }

src/Physics/Plugins/ammoJSPlugin.ts

@@ -2,7 +2,7 @@ import { Quaternion, Vector3 } from "Maths/math";
 import { IPhysicsEnginePlugin, PhysicsImpostorJoint } from "Physics/IPhysicsEngine";
 import { Logger } from "Misc/logger";
 import { PhysicsImpostor, IPhysicsEnabledObject } from "Physics/physicsImpostor";
-import { PhysicsJoint, IMotorEnabledJoint } from "Physics/physicsJoint";
+import { PhysicsJoint, IMotorEnabledJoint, DistanceJointData } from "Physics/physicsJoint";
 import { VertexBuffer } from "Meshes/buffer";
 import { Nullable } from "types";
 import { AbstractMesh } from "Meshes/abstractMesh";