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, 5 insertions, 4 deletions

diff --git a/js/lib/rdge/materials/fly-material.js b/js/lib/rdge/materials/fly-material.js
index 81cd1522..712a38ac 100644
--- a/js/lib/rdge/materials/fly-material.js
+++ b/js/lib/rdge/materials/fly-material.js
@@ -49,12 +49,12 @@ var FlyMaterial = function FlyMaterial() {
                 if (world)  this.setWorld( world );
 
                 // set up the shader
-                this._shader = new jshader();
+                this._shader = new RDGE.jshader();
                 this._shader.def = flyMaterialDef;
                 this._shader.init();
 
                 // set up the material node
-                this._materialNode = createMaterialNode("flyMaterial" + "_" + world.generateUniqueNodeID());
+                this._materialNode = RDGE.createMaterialNode("flyMaterial" + "_" + world.generateUniqueNodeID());
                 this._materialNode.setShader(this._shader);
 
                 this._time = 0;
@@ -70,7 +70,7 @@ var FlyMaterial = function FlyMaterial() {
                 this.updateTexture();
                 this.setResolution( [world.getViewportWidth(),world.getViewportHeight()] );
                 this.update( 0 );
-        }
+        };
 };
 
 ///////////////////////////////////////////////////////////////////////////////////////
@@ -78,7 +78,8 @@ var FlyMaterial = function FlyMaterial() {
  
 // shader spec (can also be loaded from a .JSON file, or constructed at runtime)
 var flyMaterialDef =
-{'shaders': 
+{
+    'shaders': 
         {
                 'defaultVShader':"assets/shaders/Basic.vert.glsl",
                 'defaultFShader':"assets/shaders/Fly.frag.glsl"