9 files changed, 96 insertions, 139 deletions

diff --git a/js/controllers/elements/shapes-controller.js b/js/controllers/elements/shapes-controller.js
index 1d945066..6dabff47 100755
--- a/js/controllers/elements/shapes-controller.js
+++ b/js/controllers/elements/shapes-controller.js
@@ -841,10 +841,10 @@ exports.ShapesController = Montage.create(CanvasController, {
                                         child.strokeMat = "Linear Gradient";
                                     }
                                 }
-                                else if( (child.strokeMat === "Radial Gradient") ||
+                                else if( !child.strokeMat || (child.strokeMat === "Radial Gradient") ||
                                          (child.strokeMat === "Linear Gradient") )
                                 {
-                                    // Set Flat Material for children geometry if color has been changed to solid
+                                    // Set Flat Material for children geometry if no material defined or color has been changed to solid
                                     child.strokeMat = "Flat";
                                 }
                             }
@@ -863,10 +863,10 @@ exports.ShapesController = Montage.create(CanvasController, {
                                         child.fillMat = "Linear Gradient";
                                     }
                                 }
-                                else if( (child.fillMat === "Radial Gradient") ||
+                                else if( !child.fillMat || (child.fillMat === "Radial Gradient") ||
                                          (child.fillMat === "Linear Gradient") )
                                 {
-                                    // Set Flat Material for children geometry if color has been changed to solid
+                                    // Set Flat Material for children geometry if no material defined or color has been changed to solid
                                     child.fillMat = "Flat";
                                 }
                             }
diff --git a/js/lib/geom/circle.js b/js/lib/geom/circle.js
index ba47603b..4995c2cb 100755
--- a/js/lib/geom/circle.js
+++ b/js/lib/geom/circle.js
@@ -83,31 +83,13 @@ exports.Circle = Object.create(GeomObj, {
 
             if(strokeMaterial) {
                 this._strokeMaterial = strokeMaterial.dup();
-            } else {
-                this._strokeMaterial = MaterialsModel.getMaterial( MaterialsModel.getDefaultMaterialName() ).dup();
-            }
-
-            if(strokeColor) {
-                if(this._strokeMaterial.hasProperty("color")) {
-                    this._strokeMaterial.setProperty( "color",  this._strokeColor );
-                } else if (this._strokeMaterial && (this._strokeMaterial.gradientType === this._strokeColor.gradientMode)) {
-                    this._strokeMaterial.setGradientData(this._strokeColor.color);
-                }
             }
 
             if(fillMaterial) {
                 this._fillMaterial = fillMaterial.dup();
-            } else {
-                this._fillMaterial = MaterialsModel.getMaterial(  MaterialsModel.getDefaultMaterialName() ).dup();
             }
 
-            if(fillColor) {
-                if(this._fillMaterial.hasProperty("color")) {
-                    this._fillMaterial.setProperty( "color",  this._fillColor );
-                } else if (this._fillMaterial && (this._fillMaterial.gradientType === this._fillColor.gradientMode)) {
-                    this._fillMaterial.setGradientData(this._fillColor.color);
-        }
-            }
+            this.initColors();
         }
     },
 
@@ -770,8 +752,8 @@ exports.Circle = Object.create(GeomObj, {
                 'fillColor'     : this._fillColor,
                 'innerRadius'   : this._innerRadius,
                 'strokeStyle'   : this._strokeStyle,
-                'strokeMat'     : this._strokeMaterial ? this._strokeMaterial.getName() :  MaterialsModel.getDefaultMaterialName(),
-                'fillMat'       : this._fillMaterial ?  this._fillMaterial.getName() :  MaterialsModel.getDefaultMaterialName(),
+                'strokeMat'     : this._strokeMaterial ? this._strokeMaterial.getName() :  null,
+                'fillMat'       : this._fillMaterial ?  this._fillMaterial.getName() :  null,
                 'materials'     : this.exportMaterialsJSON()
             };
 
@@ -790,27 +772,26 @@ exports.Circle = Object.create(GeomObj, {
             this._fillColor         = jObj.fillColor;
             this._innerRadius       = jObj.innerRadius;
             this._strokeStyle       = jObj.strokeStyle;
-            var strokeMaterialName  = jObj.strokeMat;
-            var fillMaterialName    = jObj.fillMat;
 
-            var strokeMat = MaterialsModel.getMaterial( strokeMaterialName ).dup();
-            if (!strokeMat) {
-                console.log( "object material not found in library: " + strokeMaterialName );
-                strokeMat = MaterialsModel.getMaterial(  MaterialsModel.getDefaultMaterialName() ).dup();
+            if(jObj.strokeMat) {
+                var strokeMat = MaterialsModel.getMaterial(jObj.strokeMat).dup();
+                if (!strokeMat) {
+                    console.log("object material not found in library: " + jObj.strokeMat);
+                } else {
+                    this._strokeMaterial = strokeMat;
+                }
             }
-            this._strokeMaterial = strokeMat;
-            if (this._strokeMaterial.hasProperty( 'color' ))
-                this._strokeMaterial.setProperty( 'color', this._strokeColor );
-
-            var fillMat = MaterialsModel.getMaterial( fillMaterialName ).dup();
-            if (!fillMat) {
-                console.log( "object material not found in library: " + fillMaterialName );
-                fillMat = MaterialsModel.getMaterial(  MaterialsModel.getDefaultMaterialName() ).dup();
+
+            if(jObj.fillMat) {
+                var fillMat = MaterialsModel.getMaterial(jObj.fillMat).dup();
+                if (!fillMat) {
+                    console.log("object material not found in library: " + jObj.fillMat);
+                } else {
+                    this._fillMaterial = fillMat;
+                }
             }
-            this._fillMaterial = fillMat;
-            if (this._fillMaterial.hasProperty( 'color' ))
-                this._fillMaterial.setProperty( 'color', this._fillColor );
 
+            this.initColors();
             this.importMaterialsJSON( jObj.materials );
         }
     },
diff --git a/js/lib/geom/geom-obj.js b/js/lib/geom/geom-obj.js
index e0ed51fb..7b4e49fa 100755
--- a/js/lib/geom/geom-obj.js
+++ b/js/lib/geom/geom-obj.js
@@ -205,6 +205,26 @@ exports.GeomObj = Object.create(Object.prototype, {
     ///////////////////////////////////////////////////////////////////////
     // Methods
     ///////////////////////////////////////////////////////////////////////
+    initColors: {
+        value: function() {
+            if(this._strokeColor && this._strokeMaterial) {
+                if(this._strokeMaterial.hasProperty("color")) {
+                    this._strokeMaterial.setProperty( "color",  this._strokeColor );
+                } else if (this._strokeMaterial && (this._strokeMaterial.gradientType === this._strokeColor.gradientMode)) {
+                    this._strokeMaterial.setGradientData(this._strokeColor.color);
+                }
+            }
+
+            if(this._fillColor && this._fillMaterial) {
+                if(this._fillMaterial.hasProperty("color")) {
+                    this._fillMaterial.setProperty( "color",  this._fillColor );
+                } else if (this._fillMaterial && (this._fillMaterial.gradientType === this._fillColor.gradientMode)) {
+                    this._fillMaterial.setGradientData(this._fillColor.color);
+                }
+            }
+        }
+    },
+
    setMaterialColor: {
         value: function(c, type) {
             var i = 0,
diff --git a/js/lib/geom/line.js b/js/lib/geom/line.js
index c0322f46..eec4f6d9 100755
--- a/js/lib/geom/line.js
+++ b/js/lib/geom/line.js
@@ -89,17 +89,9 @@ exports.Line = Object.create(GeomObj, {
 
             if(strokeMaterial) {
                 this._strokeMaterial = strokeMaterial.dup();
-            } else {
-                this._strokeMaterial = MaterialsModel.getMaterial( MaterialsModel.getDefaultMaterialName() ).dup();
             }
 
-            if(strokeColor) {
-                if(this._strokeMaterial.hasProperty("color")) {
-                    this._strokeMaterial.setProperty( "color",  this._strokeColor );
-                } else if (this._strokeMaterial && (this._strokeMaterial.gradientType === this._strokeColor.gradientMode)) {
-                    this._strokeMaterial.setGradientData(this._strokeColor.color);
-        }
-            }
+            this.initColors();
         }
     },
 
@@ -245,7 +237,7 @@ exports.Line = Object.create(GeomObj, {
                 'strokeWidth'   : this._strokeWidth,
                 'strokeColor'   : this._strokeColor,
                 'strokeStyle'   : this._strokeStyle,
-                'strokeMat'     : this._strokeMaterial ? this._strokeMaterial.getName() : MaterialsModel.getDefaultMaterialName(),
+                'strokeMat'     : this._strokeMaterial ? this._strokeMaterial.getName() : null,
                 'materials'     : this.exportMaterialsJSON()
             };
 
@@ -265,15 +257,17 @@ exports.Line = Object.create(GeomObj, {
             this._slope             = jObj.slope;
             this._strokeStyle       = jObj.strokeStyle;
             this._strokeColor       = jObj.strokeColor;
-            var strokeMaterialName  = jObj.strokeMat;
 
-            var strokeMat = MaterialsModel.getMaterial( strokeMaterialName );
-            if (!strokeMat) {
-                console.log( "object material not found in library: " + strokeMaterialName );
-                strokeMat = MaterialsModel.getMaterial(  MaterialsModel.getDefaultMaterialName() );
+            if(jObj.strokeMat) {
+                var strokeMat = MaterialsModel.getMaterial(jObj.strokeMat).dup();
+                if (!strokeMat) {
+                    console.log("object material not found in library: " + jObj.strokeMat);
+                } else {
+                    this._strokeMaterial = strokeMat;