1 files changed, 10 insertions, 1 deletions

diff --git a/js/lib/geom/geom-obj.js b/js/lib/geom/geom-obj.js
index 4cb21a25..6b73463f 100755
--- a/js/lib/geom/geom-obj.js
+++ b/js/lib/geom/geom-obj.js
@@ -180,7 +180,7 @@ exports.GeomObj = Object.create(Object.prototype, {
     ///////////////////////////////////////////////////////////////////////
     // Methods
     ///////////////////////////////////////////////////////////////////////
-    setMaterialColor: {
+   setMaterialColor: {
         value: function(c, type) {
             var i = 0,
                 nMats = 0;
@@ -285,6 +285,8 @@ exports.GeomObj = Object.create(Object.prototype, {
                 this.setStrokeColor(this._strokeColor);
             }
 
+                        this._strokeMaterial = strokeMaterial;
+
             return strokeMaterial;
         }
     },
@@ -309,12 +311,16 @@ exports.GeomObj = Object.create(Object.prototype, {
                 this.setFillColor(this._fillColor);
             }
 
+        this._fillMaterial = fillMaterial;
+
             return fillMaterial;
         }
     },
 
     exportMaterialsJSON: {
         value: function() {
+                        MaterialsModel = require("js/models/materials-model").MaterialsModel;
+
             var jObj;
             if (this._materialArray && this._materialNodeArray && this.getWorld().isWebGL()) {
                 var nMats = this._materialArray.length;
@@ -345,6 +351,8 @@ exports.GeomObj = Object.create(Object.prototype, {
 
     importMaterialsJSON: {
         value: function(jObj) {
+                        MaterialsModel = require("js/models/materials-model").MaterialsModel;
+
             this._materialArray = [];
             this._materialTypeArray = [];
 
@@ -370,6 +378,7 @@ exports.GeomObj = Object.create(Object.prototype, {
                     case "tunnel":
                     case "reliefTunnel":
                     case "squareTunnel":
+                                        case "flag":
                     case "twist":
                     case "fly":
                     case "julia":