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

diff --git a/js/lib/geom/shape-primitive.js b/js/lib/geom/shape-primitive.js
index 44a7aa52..380cf334 100644
--- a/js/lib/geom/shape-primitive.js
+++ b/js/lib/geom/shape-primitive.js
@@ -8,11 +8,11 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 var ShapePrimitive = {};
 
 ShapePrimitive.create = function(coords,  normals,  uvs,  indices, primType, vertexCount) {
-        var renderer = g_Engine.getContext().renderer;
+        var renderer = RDGE.globals.engine.getContext().renderer;
 
         // to setup a primitive you must define it
         // create a new primitive definition here to then fill out
-        var prim = new rdgePrimitiveDefinition();
+        var prim = new RDGE.rdgePrimitiveDefinition();
 
         // the vertex definition declares how the data will be delivered to the shader
         // the position of an element in array determines which attribute in a shader the