Browse Source

Fix Merge

sebavan 6 years ago
parent
commit
4af54cdf57
2 changed files with 3 additions and 3 deletions
  1. 1 2
      gui/src/2D/controls/container.ts
  2. 2 1
      src/Misc/index.ts

+ 1 - 2
gui/src/2D/controls/container.ts

@@ -1,8 +1,7 @@
 import { Control } from "./control";
 import { Control } from "./control";
 import { Measure } from "../measure";
 import { Measure } from "../measure";
-import { Nullable } from "babylonjs";
+import { Nullable, Logger } from "babylonjs";
 import { AdvancedDynamicTexture } from "../advancedDynamicTexture";
 import { AdvancedDynamicTexture } from "../advancedDynamicTexture";
-import { Logger } from "babylonjs/Misc/logger";
 
 
 /**
 /**
  * Root class for 2D containers
  * Root class for 2D containers

+ 2 - 1
src/Misc/index.ts

@@ -20,4 +20,5 @@ export * from "./tga";
 export * from "./tools";
 export * from "./tools";
 export * from "./videoRecorder";
 export * from "./videoRecorder";
 export * from "./virtualJoystick";
 export * from "./virtualJoystick";
-export * from "./workerPool";
+export * from "./workerPool";
+export * from "./logger";