Merge branch 'refs/heads/master' into CSSPanelUpdates

1 files changed, 21 insertions, 0 deletions

diff --git a/js/lib/rdge/materials/flat-material.js b/js/lib/rdge/materials/flat-material.js
index fff0e68e..5030cc88 100755
--- a/js/lib/rdge/materials/flat-material.js
+++ b/js/lib/rdge/materials/flat-material.js
@@ -112,6 +112,27 @@ var FlatMaterial = function FlatMaterial() {
         return rtnStr;
     };
 
+        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 );
+        
+                var color  = jObj.color;
+                this.setProperty( "color",  color);
+        }
+
         this.update = function( time )
         {
         };