瀏覽代碼

Fix Merge

sebavan 6 年之前
父節點
當前提交
af5f99a7ca
共有 2 個文件被更改,包括 2 次插入2 次删除
  1. 1 1
      src/Debug/axesViewer.ts
  2. 1 1
      src/Physics/Plugins/ammoJSPlugin.ts

+ 1 - 1
src/Debug/axesViewer.ts

@@ -1,4 +1,4 @@
-import { Vector3, Color3, Quaternion } from "Maths/math";
+import { Vector3, Color3 } from "Maths/math";
 import { Nullable } from "types";
 import { Scene } from "scene";
 import { TransformNode } from "Meshes/transformNode";

+ 1 - 1
src/Physics/Plugins/ammoJSPlugin.ts

@@ -458,7 +458,7 @@ import { AbstractMesh } from "Meshes/abstractMesh";
                     returnValue = new Ammo.btSphereShape(extendSize.x / 2);
                     break;
                 default:
-                    Tools.Warn("The impostor type is not currently supported by the ammo plugin.");
+                    Logger.Warn("The impostor type is not currently supported by the ammo plugin.");
                     break;
             }