浏览代码

reverting

Arthur Fiedler 6 年之前
父节点
当前提交
72ce032b27
共有 1 个文件被更改,包括 4 次插入0 次删除
  1. 4 0
      src/Meshes/polygonMesh.ts

+ 4 - 0
src/Meshes/polygonMesh.ts

@@ -157,10 +157,14 @@ export class PolygonMeshBuilder {
 
     private _name: string;
 <<<<<<< HEAD
+<<<<<<< HEAD
     private _scene: Nullable<Scene>;
 =======
     private _scene: Scene;
 >>>>>>> parent of c4dbc00cf... Update polygonMesh.ts
+=======
+    private _scene: Scene;
+>>>>>>> parent of c4dbc00cf... Update polygonMesh.ts
 
     private _epoints: number[] = new Array<number>();
     private _eholes: number[] = new Array<number>();