Merge branch 'refs/heads/ninja-internal' into WebGLFixes

1 files changed, 5 insertions, 9 deletions

diff --git a/js/lib/rdge/materials/julia-material.js b/js/lib/rdge/materials/julia-material.js
index 976dfad3..7aeec3dc 100644
--- a/js/lib/rdge/materials/julia-material.js
+++ b/js/lib/rdge/materials/julia-material.js
@@ -21,11 +21,7 @@ var JuliaMaterial = function JuliaMaterial() {
     ///////////////////////////////////////////////////////////////////////
     // Properties
     ///////////////////////////////////////////////////////////////////////
-        // no properties
-        this._propNames                 = [];
-        this._propLabels                = [];
-        this._propTypes                 = [];
-        this._propValues                = [];
+        // properties inherited from PulseMaterial
 
     ///////////////////////////////////////////////////////////////////////
     // Methods
@@ -50,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;
@@ -72,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] );
@@ -80,7 +76,7 @@ var JuliaMaterial = function JuliaMaterial() {
                                 this._time = time;
                         }
                 }
-        }
+        };
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////