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

diff --git a/js/lib/rdge/materials/keleidoscope-material.js b/js/lib/rdge/materials/keleidoscope-material.js
index a687bd59..db325eaa 100644
--- a/js/lib/rdge/materials/keleidoscope-material.js
+++ b/js/lib/rdge/materials/keleidoscope-material.js
@@ -56,12 +56,12 @@ var KeleidoscopeMaterial = function KeleidoscopeMaterial() {
                 if (world)  this.setWorld( world );
 
                 // set up the shader
-                this._shader = new jshader();
+                this._shader = new RDGE.jshader();
                 this._shader.def = keleidoscopeMaterialDef;
                 this._shader.init();
 
                 // set up the material node
-                this._materialNode = createMaterialNode("keleidoscopeMaterial" + "_" + world.generateUniqueNodeID());
+                this._materialNode = RDGE.createMaterialNode("keleidoscopeMaterial" + "_" + world.generateUniqueNodeID());
                 this._materialNode.setShader(this._shader);
 
                 this._time = 0;
@@ -85,7 +85,7 @@ var KeleidoscopeMaterial = function KeleidoscopeMaterial() {
                 if (material)
                 {
                         var technique = material.shaderProgram['default'];
-                        var renderer = g_Engine.getContext().renderer;
+                        var renderer = RDGE.globals.engine.getContext().renderer;
                         if (renderer && technique)
                         {
                                 if (this._shader && this._shader['default']) {
@@ -95,7 +95,7 @@ var KeleidoscopeMaterial = function KeleidoscopeMaterial() {
                                 this._time = time;
                         }
                 }
-        }
+        };
 };
 
 ///////////////////////////////////////////////////////////////////////////////////////