Pārlūkot izejas kodu

Revert "Update polygonMesh.ts"

This reverts commit c4dbc00cf05f375884c9352797bed880b6f586a2.
Arthur Fiedler 6 gadi atpakaļ
vecāks
revīzija
9aecb72053
1 mainītis faili ar 4 papildinājumiem un 0 dzēšanām
  1. 4 0
      src/Meshes/polygonMesh.ts

+ 4 - 0
src/Meshes/polygonMesh.ts

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