From 98a02c1ac6f189aba93d7cce64ba5bdbc0617f6c Mon Sep 17 00:00:00 2001
From: hwc487
Date: Tue, 20 Mar 2012 16:26:52 -0700
Subject: Bug Fixes for Canvas & WebGL File IO

---
 js/lib/geom/geom-obj.js | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'js/lib/geom/geom-obj.js')

diff --git a/js/lib/geom/geom-obj.js b/js/lib/geom/geom-obj.js
index 63f71955..75b7808b 100755
--- a/js/lib/geom/geom-obj.js
+++ b/js/lib/geom/geom-obj.js
@@ -279,6 +279,11 @@ var GeomObj = function GLGeomObj() {
 
 	this.importMaterialsJSON = function( jObj )
 	{
+		this._materialArray = [];
+		this._materialTypeArray = [];
+
+		if (!jObj)  return;
+
 		var nMaterials = jObj.nMaterials;
 		var matArray = jObj.materials;
 		for (var i=0;  i<nMaterials;  i++)
@@ -318,7 +323,14 @@ var GeomObj = function GLGeomObj() {
 			}
 
 			if (mat)
+			{
 				mat.importJSON( matObj );
+				this._materialArray.push( mat );
+				this._materialTypeArray.push( matObj.type );
+				var type = matArray[i].type;
+				if (type == "fill")  this._fillMaterial = mat;
+				else  this._strokeMaterial = mat;
+			}
 		}
 	}
 
-- 
cgit v1.2.3