aboutsummaryrefslogtreecommitdiff
path: root/js/lib/geom/rectangle.js
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-03-11 11:29:56 -0700
committerJose Antonio Marquez2012-03-11 11:29:56 -0700
commit49e4c8695941f6bdd15893534ffb3ccce92c5396 (patch)
tree9e8327be823441717ad44684d0e3714c56116f39 /js/lib/geom/rectangle.js
parent9ab4b4306343ec2a20094c7626abb524b7720ce8 (diff)
parent242bddd5b64c4a5226daa2f4caa10bf63c56403a (diff)
downloadninja-49e4c8695941f6bdd15893534ffb3ccce92c5396.tar.gz
Merge branch 'refs/heads/FileIO-Integration' into FileIO
Diffstat (limited to 'js/lib/geom/rectangle.js')
-rwxr-xr-xjs/lib/geom/rectangle.js5
1 files changed, 4 insertions, 1 deletions
diff --git a/js/lib/geom/rectangle.js b/js/lib/geom/rectangle.js
index f91e830c..370bb257 100755
--- a/js/lib/geom/rectangle.js
+++ b/js/lib/geom/rectangle.js
@@ -79,6 +79,8 @@ var Rectangle = function GLRectangle() {
79 } else { 79 } else {
80 this._fillMaterial = MaterialsModel.exportFlatMaterial(); 80 this._fillMaterial = MaterialsModel.exportFlatMaterial();
81 } 81 }
82
83 this.exportMaterials();
82 }; 84 };
83 85
84 /////////////////////////////////////////////////////////////////////// 86 ///////////////////////////////////////////////////////////////////////
@@ -264,8 +266,9 @@ var Rectangle = function GLRectangle() {
264 console.log( "object material not found in library: " + fillMaterialName ); 266 console.log( "object material not found in library: " + fillMaterialName );
265 fillMat = MaterialsModel.exportFlatMaterial(); 267 fillMat = MaterialsModel.exportFlatMaterial();
266 } 268 }
267
268 this._fillMaterial = fillMat; 269 this._fillMaterial = fillMat;
270
271 this.importMaterials( importStr );
269 }; 272 };
270 273
271 this.buildBuffers = function() { 274 this.buildBuffers = function() {