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

diff --git a/js/lib/rdge/materials/fly-material.js b/js/lib/rdge/materials/fly-material.js
index bd92ecd8..37bef66a 100644
--- a/js/lib/rdge/materials/fly-material.js
+++ b/js/lib/rdge/materials/fly-material.js
@@ -48,12 +48,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;
@@ -65,7 +65,7 @@ var FlyMaterial = function FlyMaterial() {
                 this.updateTexture();
                 this.setResolution( [world.getViewportWidth(),world.getViewportHeight()] );
                 this.update( 0 );
-        }
+        };
 };
 
 ///////////////////////////////////////////////////////////////////////////////////////
@@ -73,7 +73,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"