Merge branch 'refs/heads/ToolFixes' into WebGLMaterials

Conflicts:
	js/document/templates/montage-html/default_html.css
	js/mediators/element-mediator.js
	js/panels/properties.reel/properties.js
	js/tools/BrushTool.js
	js/tools/LineTool.js
	js/tools/PenTool.js
	js/tools/SelectionTool.js
	js/tools/ShapeTool.js
	js/tools/TranslateObject3DTool.js

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/js/lib/rdge/materials/julia-material.js b/js/lib/rdge/materials/julia-material.js
index a85bd6f7..7aeec3dc 100644
--- a/js/lib/rdge/materials/julia-material.js
+++ b/js/lib/rdge/materials/julia-material.js
@@ -46,12 +46,12 @@ var JuliaMaterial = function JuliaMaterial() {
                 if (world)  this.setWorld( world );
 
                 // set up the shader
-                this._shader = new jshader();
+                this._shader = new RDGE.jshader();
                 this._shader.def = JuliaMaterialDef;
                 this._shader.init();
 
                 // set up the material node
-                this._materialNode = createMaterialNode("juliaMaterial" + "_" + world.generateUniqueNodeID());
+                this._materialNode = RDGE.createMaterialNode("juliaMaterial" + "_" + world.generateUniqueNodeID());
                 this._materialNode.setShader(this._shader);
 
                 this._time = 0;
@@ -68,7 +68,7 @@ var JuliaMaterial = function JuliaMaterial() {
                 var material = this._materialNode;
                 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']) {
                                         this._shader['default'].u_time.set( [this._time] );
@@ -76,7 +76,7 @@ var JuliaMaterial = function JuliaMaterial() {
                                 this._time = time;
                         }
                 }
-        }
+        };
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////