diff options
author | Jose Antonio Marquez | 2012-03-11 11:29:56 -0700 |
---|---|---|
committer | Jose Antonio Marquez | 2012-03-11 11:29:56 -0700 |
commit | 49e4c8695941f6bdd15893534ffb3ccce92c5396 (patch) | |
tree | 9e8327be823441717ad44684d0e3714c56116f39 /js/lib/geom/circle.js | |
parent | 9ab4b4306343ec2a20094c7626abb524b7720ce8 (diff) | |
parent | 242bddd5b64c4a5226daa2f4caa10bf63c56403a (diff) | |
download | ninja-49e4c8695941f6bdd15893534ffb3ccce92c5396.tar.gz |
Merge branch 'refs/heads/FileIO-Integration' into FileIO
Diffstat (limited to 'js/lib/geom/circle.js')
-rwxr-xr-x | js/lib/geom/circle.js | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/js/lib/geom/circle.js b/js/lib/geom/circle.js index ad77383b..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 | /////////////////////////////////////////////////////////////////////// |
@@ -610,8 +612,9 @@ var Circle = function GLCircle() { | |||
610 | console.log( "object material not found in library: " + fillMaterialName ); | 612 | console.log( "object material not found in library: " + fillMaterialName ); |
611 | fillMat = MaterialsModel.exportFlatMaterial(); | 613 | fillMat = MaterialsModel.exportFlatMaterial(); |
612 | } | 614 | } |
613 | |||
614 | this._fillMaterial = fillMat; | 615 | this._fillMaterial = fillMat; |
616 | |||
617 | this.importMaterials( importStr ); | ||
615 | }; | 618 | }; |
616 | 619 | ||
617 | this.collidesWithPoint = function( x, y ) { | 620 | this.collidesWithPoint = function( x, y ) { |