aboutsummaryrefslogtreecommitdiff
path: root/js/lib/geom/circle.js
diff options
context:
space:
mode:
Diffstat (limited to 'js/lib/geom/circle.js')
-rwxr-xr-xjs/lib/geom/circle.js8
1 files changed, 6 insertions, 2 deletions
diff --git a/js/lib/geom/circle.js b/js/lib/geom/circle.js
index dd82a4cc..f94d4e6b 100755
--- a/js/lib/geom/circle.js
+++ b/js/lib/geom/circle.js
@@ -61,6 +61,8 @@ var Circle = function GLCircle() {
61 } else { 61 } else {
62 this._fillMaterial = MaterialsModel.exportFlatMaterial(); 62 this._fillMaterial = MaterialsModel.exportFlatMaterial();
63 } 63 }
64
65 this.exportMaterials();
64 }; 66 };
65 67
66 /////////////////////////////////////////////////////////////////////// 68 ///////////////////////////////////////////////////////////////////////
@@ -577,9 +579,10 @@ var Circle = function GLCircle() {
577 } else { 579 } else {
578 rtnStr += "flatMaterial"; 580 rtnStr += "flatMaterial";
579 } 581 }
580
581 rtnStr += "\n"; 582 rtnStr += "\n";
582 583
584 rtnStr += this.exportMaterials();
585
583 return rtnStr; 586 return rtnStr;
584 }; 587 };
585 588
@@ -609,8 +612,9 @@ var Circle = function GLCircle() {
609 console.log( "object material not found in library: " + fillMaterialName ); 612 console.log( "object material not found in library: " + fillMaterialName );
610 fillMat = MaterialsModel.exportFlatMaterial(); 613 fillMat = MaterialsModel.exportFlatMaterial();
611 } 614 }
612
613 this._fillMaterial = fillMat; 615 this._fillMaterial = fillMat;
616
617 this.importMaterials( importStr );
614 }; 618 };
615 619
616 this.collidesWithPoint = function( x, y ) { 620 this.collidesWithPoint = function( x, y ) {