Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Snapping

Conflicts:
	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

1 files changed, 0 insertions, 15 deletions

diff --git a/js/lib/rdge/materials/material.js b/js/lib/rdge/materials/material.js
index c1d13b15..276c7687 100755
--- a/js/lib/rdge/materials/material.js
+++ b/js/lib/rdge/materials/material.js
@@ -252,21 +252,6 @@ var Material = function GLMaterial( world ) {
                 return tex;
         };
 
-        this.export = function() {
-                // this function should be overridden by subclasses
-                var exportStr = "material: " + this.getShaderName() + "\n" + "endMaterial\n";
-                return exportStr;
-        };
-
-        this.import = function( importStr ) {
-                var endKey = "endMaterial\n";
-                var index = importStr.indexOf( endKey );
-                index += endKey.length;
-                var rtnStr = importStr.substr( index );
-
-                return rtnStr;
-        };
-
         /*
         this.setRenderProperties = function( glContext, shaderProgram )
         {