Merge branch 'refs/heads/integration' into FileIO-Integration

Conflicts:
	js/document/html-document.js

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() {
         } else {
                         this._fillMaterial = MaterialsModel.exportFlatMaterial();
         }
+
+                this.exportMaterials();
         };
 
     ///////////////////////////////////////////////////////////////////////
@@ -610,8 +612,9 @@ var Circle = function GLCircle() {
                         console.log( "object material not found in library: " + fillMaterialName );
                         fillMat = MaterialsModel.exportFlatMaterial();
                 }
-
                 this._fillMaterial = fillMat;
+
+                this.importMaterials( importStr );
         };
 
     this.collidesWithPoint = function( x, y ) {