Merge branch 'refs/heads/ninja-internal' into WebGLFixes

1 files changed, 6 insertions, 3 deletions

diff --git a/js/lib/geom/rectangle.js b/js/lib/geom/rectangle.js
index 6abaef2f..a47295e0 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();
         };
 
         ///////////////////////////////////////////////////////////////////////
@@ -230,7 +232,6 @@ var Rectangle = function GLRectangle() {
         } else {
                         rtnStr += "flatMaterial";
         }
-
                 rtnStr += "\n";
 
                 rtnStr += "fillMat: ";
@@ -239,9 +240,10 @@ var Rectangle = function GLRectangle() {
         } else {
                         rtnStr += "flatMaterial";
         }
-
                 rtnStr += "\n";
 
+                rtnStr += this.exportMaterials();
+
                 return rtnStr;
         };
 
@@ -292,8 +294,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() {