Merge branch 'master' into pentool

Conflicts:
	js/tools/PenTool.js

1 files changed, 17 insertions, 2 deletions

diff --git a/js/lib/geom/circle.js b/js/lib/geom/circle.js
index 7fa78b12..1073c2db 100755
--- a/js/lib/geom/circle.js
+++ b/js/lib/geom/circle.js
@@ -42,8 +42,8 @@ var Circle = function GLCircle() {
         
                         this._strokeWidth = strokeSize;
                         this._innerRadius = innerRadius;
-                        if (strokeColor)  this._strokeColor = strokeColor;
-                        if (fillColor)  this._fillColor = fillColor;
+                        this._strokeColor = strokeColor;
+                        this._fillColor = fillColor;
 
                         this._strokeStyle = strokeStyle;
                 }
@@ -631,6 +631,21 @@ var Circle = function GLCircle() {
                 this._strokeStyle               = jObj.strokeStyle;
                 var strokeMaterialName  = jObj.strokeMat;
                 var fillMaterialName    = jObj.fillMat;
+
+        var strokeMat = MaterialsModel.getMaterial( strokeMaterialName );
+        if (!strokeMat) {
+            console.log( "object material not found in library: " + strokeMaterialName );
+            strokeMat = MaterialsModel.getMaterial(  MaterialsModel.getDefaultMaterialName() );
+        }
+        this._strokeMaterial = strokeMat;
+
+        var fillMat = MaterialsModel.getMaterial( fillMaterialName );
+        if (!fillMat) {
+            console.log( "object material not found in library: " + fillMaterialName );
+            fillMat = MaterialsModel.getMaterial(  MaterialsModel.getDefaultMaterialName() );
+        }
+        this._fillMaterial = fillMat;
+
                 this.importMaterialsJSON( jObj.materials );
         };