Merge branch 'refs/heads/WebGLFileIO' into ToolFixes

Conflicts:
	assets/canvas-runtime.js
	js/controllers/elements/shapes-controller.js
	js/lib/drawing/world.js
	js/lib/geom/geom-obj.js
	js/lib/geom/line.js
	js/mediators/element-mediator.js
	js/panels/presets/animations-presets.reel/animations-presets.js
	js/panels/presets/style-presets.reel/style-presets.js
	js/panels/presets/transitions-presets.reel/transitions-presets.js

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>

1 files changed, 15 insertions, 0 deletions

diff --git a/js/lib/geom/rectangle.js b/js/lib/geom/rectangle.js
index 00c40eb9..91b1d426 100755
--- a/js/lib/geom/rectangle.js
+++ b/js/lib/geom/rectangle.js
@@ -231,6 +231,21 @@ var Rectangle = function GLRectangle() {
                 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 );
         };