Merge branch 'master' into brushtool

Conflicts:
	js/controllers/elements/shapes-controller.js

1 files changed, 18 insertions, 0 deletions

diff --git a/js/lib/rdge/materials/plasma-material.js b/js/lib/rdge/materials/plasma-material.js
index 86b1a93c..b04d8451 100644
--- a/js/lib/rdge/materials/plasma-material.js
+++ b/js/lib/rdge/materials/plasma-material.js
@@ -67,6 +67,24 @@ var PlasmaMaterial = function PlasmaMaterial() {
                 this._time += this._dTime;
         }
 
+        this.exportJSON = function()
+        {
+                var jObj =
+                {
+                        'material'              : this.getShaderName(),
+                        'name'                  : this.getName(),
+                        'speed'                 : this._speed,
+                        'dTime'                 : this._dTime
+                }
+
+                return jObj;
+        }
+
+        this.importJSON = function( jObj )
+        {
+                this._speed = jObj.speed;
+                this._dTime = jObj.dTime;
+        }
 };
 
 ///////////////////////////////////////////////////////////////////////////////////////