diff options
Diffstat (limited to 'js/lib/geom/circle.js')
-rwxr-xr-x | js/lib/geom/circle.js | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/js/lib/geom/circle.js b/js/lib/geom/circle.js index 05501ec3..4b155b4c 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 | /////////////////////////////////////////////////////////////////////// |
@@ -636,9 +638,10 @@ var Circle = function GLCircle() { | |||
636 | } else { | 638 | } else { |
637 | rtnStr += "flatMaterial"; | 639 | rtnStr += "flatMaterial"; |
638 | } | 640 | } |
639 | |||
640 | rtnStr += "\n"; | 641 | rtnStr += "\n"; |
641 | 642 | ||
643 | rtnStr += this.exportMaterials(); | ||
644 | |||
642 | return rtnStr; | 645 | return rtnStr; |
643 | }; | 646 | }; |
644 | 647 | ||
@@ -682,8 +685,9 @@ var Circle = function GLCircle() { | |||
682 | console.log( "object material not found in library: " + fillMaterialName ); | 685 | console.log( "object material not found in library: " + fillMaterialName ); |
683 | fillMat = MaterialsModel.exportFlatMaterial(); | 686 | fillMat = MaterialsModel.exportFlatMaterial(); |
684 | } | 687 | } |
685 | |||
686 | this._fillMaterial = fillMat; | 688 | this._fillMaterial = fillMat; |
689 | |||
690 | this.importMaterials( importStr ); | ||
687 | }; | 691 | }; |
688 | 692 | ||
689 | this.collidesWithPoint = function( x, y ) { | 693 | this.collidesWithPoint = function( x, y ) { |