Merge branch 'refs/heads/master' into CSSPanelUpdates

1 files changed, 27 insertions, 0 deletions

diff --git a/js/lib/rdge/materials/taper-material.js b/js/lib/rdge/materials/taper-material.js
index 03a7ba9c..15b7b2b0 100644
--- a/js/lib/rdge/materials/taper-material.js
+++ b/js/lib/rdge/materials/taper-material.js
@@ -96,6 +96,33 @@ function TaperMaterial()
                 }
         }
         ///////////////////////////////////////////////////////////////////////
+        this.exportJSON = function()
+        {
+                var jObj =
+                {
+                        'material'              : this.getShaderName(),
+                        'name'                  : this.getName(),
+                        'color'                 : this._propValues["color"]
+                };
+
+                return jObj;
+        }
+
+        this.importJSON = function( jObj )
+        {
+        if (this.getShaderName() != jObj.material)  throw new Error( "ill-formed material" );
+        this.setName( jObj.name );
+
+                try
+                {
+                        var color  = jObj.color;
+                        this.setProperty( "color",  color);
+                }
+                catch (e)
+                {
+                        throw new Error( "could not import material: " + jObj );
+                }
+        }
 
         this.export = function()
         {