From 818582d389f504c915be0c9052fafa33e3e76c92 Mon Sep 17 00:00:00 2001
From: hwc487
Date: Wed, 7 Mar 2012 16:48:48 -0800
Subject: File IO

---
 js/lib/geom/rectangle.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'js/lib/geom/rectangle.js')

diff --git a/js/lib/geom/rectangle.js b/js/lib/geom/rectangle.js
index 81b385b3..f91e830c 100755
--- a/js/lib/geom/rectangle.js
+++ b/js/lib/geom/rectangle.js
@@ -218,7 +218,6 @@ var Rectangle = function GLRectangle() {
         } else {
 			rtnStr += "flatMaterial";
         }
-
 		rtnStr += "\n";
 
 		rtnStr += "fillMat: ";
@@ -227,9 +226,10 @@ var Rectangle = function GLRectangle() {
         } else {
 			rtnStr += "flatMaterial";
         }
-
 		rtnStr += "\n";
 
+		rtnStr += this.exportMaterials();
+
 		return rtnStr;
 	};
 
-- 
cgit v1.2.3


From 7b6e8194b91168abdeb94702eb350d14f147858b Mon Sep 17 00:00:00 2001
From: hwc487
Date: Thu, 8 Mar 2012 17:29:18 -0800
Subject: Canvas IO

---
 js/lib/geom/rectangle.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'js/lib/geom/rectangle.js')

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() {
         } else {
 			this._fillMaterial = MaterialsModel.exportFlatMaterial();
         }
+
+		this.exportMaterials();
 	};
 
 	///////////////////////////////////////////////////////////////////////
@@ -264,8 +266,9 @@ var Rectangle = function GLRectangle() {
 			console.log( "object material not found in library: " + fillMaterialName );
 			fillMat = MaterialsModel.exportFlatMaterial();
 		}
-
 		this._fillMaterial = fillMat;
+
+		this.importMaterials( importStr );
 	};
 
 	this.buildBuffers = function() {
-- 
cgit v1.2.3