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

Conflicts:
	js/lib/drawing/world.js
	js/lib/geom/geom-obj.js
	js/lib/rdge/materials/cloud-material.js
	js/lib/rdge/materials/deform-material.js
	js/lib/rdge/materials/flat-material.js
	js/lib/rdge/materials/material.js
	js/lib/rdge/materials/pulse-material.js
	js/lib/rdge/materials/relief-tunnel-material.js
	js/lib/rdge/materials/square-tunnel-material.js
	js/lib/rdge/materials/star-material.js
	js/lib/rdge/materials/taper-material.js
	js/lib/rdge/materials/tunnel-material.js
	js/lib/rdge/materials/twist-material.js
	js/lib/rdge/materials/twist-vert-material.js
	js/lib/rdge/materials/uber-material.js
	js/lib/rdge/materials/water-material.js
	js/lib/rdge/materials/z-invert-material.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 bc4c8e6b..4b8a5d6b 100755
--- a/js/lib/rdge/materials/material.js
+++ b/js/lib/rdge/materials/material.js
@@ -264,21 +264,6 @@ var Material = function GLMaterial( world ) {
                 // should override this function.
         }
 
-        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;
-        };
-
 };
 
 if (typeof exports === "object") {