Fix Merge

gui/src/2D/controls/container.ts

@@ -2,6 +2,7 @@ import { Control } from "./control";
 import { Measure } from "../measure";
 import { Nullable } from "babylonjs";
 import { AdvancedDynamicTexture } from "../advancedDynamicTexture";
+import { Logger } from "babylonjs/Misc/logger";
 
 /**
  * Root class for 2D containers
@@ -334,7 +335,7 @@ export class Container extends Control {
         while (this._rebuildLayout && rebuildCount < 3);
 
         if (rebuildCount >= 3) {
-            BABYLON.Tools.Error(`Layout cycle detected in GUI (Container uniqueId=${this.uniqueId})`);
+            Logger.Error(`Layout cycle detected in GUI (Container uniqueId=${this.uniqueId})`);
         }
 
         context.restore();

gui/src/2D/controls/inputText.ts

@@ -1,7 +1,7 @@
 import { Control } from "./control";
 import { IFocusableControl } from "../advancedDynamicTexture";
 import { ValueAndUnit } from "../valueAndUnit";
-import { Nullable, Observable, Observer, Vector2, ClipboardEventTypes, ClipboardInfo, PointerInfo } from 'babylonjs';
+import { Nullable, Observable, Observer, Vector2, ClipboardEventTypes, ClipboardInfo, PointerInfo, PointerEventTypes } from 'babylonjs';
 import { VirtualKeyboard } from "./virtualKeyboard";
 
 /**

gui/src/2D/controls/scrollViewers/scrollViewer.ts

@@ -2,7 +2,7 @@ import { Rectangle } from "../rectangle";
 import { Grid } from "../grid";
 import { Control } from "../control";
 import { Container } from "../container";
-import { PointerInfo, Observer, Nullable } from "babylonjs";
+import { PointerInfo, Observer, Nullable, PointerEventTypes } from "babylonjs";
 import { AdvancedDynamicTexture, Measure } from "2D";
 import { _ScrollViewerWindow } from "./scrollViewerWindow";
 import { ScrollBar } from "../sliders/scrollBar";
@@ -331,7 +331,7 @@ export class ScrollViewer extends Rectangle {
 
         let scene = this._host.getScene();
         this._onPointerObserver = scene!.onPointerObservable.add((pi, state) => {
-            if (!this._pointerIsOver || pi.type !== BABYLON.PointerEventTypes.POINTERWHEEL) {
+            if (!this._pointerIsOver || pi.type !== PointerEventTypes.POINTERWHEEL) {
                 return;
             }
             if (this._verticalBar.isVisible == true) {