Explorar o código

Fix Merge Libs

sebavan %!s(int64=6) %!d(string=hai) anos
pai
achega
70cc8c662e

+ 2 - 2
gui/src/2D/controls/control.ts

@@ -1,7 +1,7 @@
 import { Container } from "./container";
 import { AdvancedDynamicTexture } from "../advancedDynamicTexture";
 import { ValueAndUnit } from "../valueAndUnit";
-import { Nullable, Observer, Vector2, AbstractMesh, Observable, Vector3, Scene, Tools, Matrix, PointerEventTypes } from "babylonjs";
+import { Nullable, Observer, Vector2, AbstractMesh, Observable, Vector3, Scene, Tools, Matrix, PointerEventTypes, Logger } from "babylonjs";
 import { Measure } from "../measure";
 import { Style } from "../style";
 import { Matrix2D, Vector2WithInfo } from "../math2D";
@@ -1188,7 +1188,7 @@ export class Control {
         while (this._rebuildLayout && rebuildCount < 3);
 
         if (rebuildCount >= 3) {
-            BABYLON.Tools.Error(`Layout cycle detected in GUI (Control uniqueId=${this.uniqueId})`);
+            Logger.Error(`Layout cycle detected in GUI (Control uniqueId=${this.uniqueId})`);
         }
 
         context.restore();

+ 1 - 0
inspector/src/components/actionTabs/tabs/debugTabComponent.tsx

@@ -3,6 +3,7 @@ import { PaneComponent, IPaneComponentProps } from "../paneComponent";
 import { LineContainerComponent } from "../lineContainerComponent";
 import { CheckBoxLineComponent } from "../lines/checkBoxLineComponent";
 import { RenderGridPropertyGridComponent } from "./propertyGrids/renderGridPropertyGridComponent";
+import { SkeletonViewer, PhysicsViewer, StandardMaterial } from "babylonjs";
 
 export class DebugTabComponent extends PaneComponent {
     private _skeletonViewersEnabled = false;

+ 1 - 1
inspector/src/components/actionTabs/tabs/propertyGrids/renderGridPropertyGridComponent.tsx

@@ -3,7 +3,7 @@ import { Scene, AbstractMesh, Nullable, UtilityLayerRenderer, Tools, Mesh, Color
 import { CheckBoxLineComponent } from "../../lines/checkBoxLineComponent";
 
 interface IRenderGridPropertyGridComponentProps {
-    scene: Scene
+    scene: Scene;
 }
 
 export class RenderGridPropertyGridComponent extends React.Component<IRenderGridPropertyGridComponentProps, { isEnabled: boolean }> {