aboutsummaryrefslogtreecommitdiff
path: root/js/helper-classes/RDGE/Materials/TunnelMaterial.js
diff options
context:
space:
mode:
authorJohn Mayhew2012-02-10 16:04:19 -0800
committerJohn Mayhew2012-02-10 16:04:19 -0800
commit730c1e191e36b8ab8dba576c481a6585e0dfa69e (patch)
treec86445ff8d1981e97096ec5e9f6cc5301dc9ea40 /js/helper-classes/RDGE/Materials/TunnelMaterial.js
parentcde1dd9a9156b9682fdf85ce2cd4acdd94124c37 (diff)
parent48977780443d97b9e97b047066639c9056788041 (diff)
downloadninja-730c1e191e36b8ab8dba576c481a6585e0dfa69e.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch
Conflicts: js/ninja.reel/ninja.html
Diffstat (limited to 'js/helper-classes/RDGE/Materials/TunnelMaterial.js')
-rw-r--r--js/helper-classes/RDGE/Materials/TunnelMaterial.js3
1 files changed, 3 insertions, 0 deletions
diff --git a/js/helper-classes/RDGE/Materials/TunnelMaterial.js b/js/helper-classes/RDGE/Materials/TunnelMaterial.js
index fe277af6..9b12e197 100644
--- a/js/helper-classes/RDGE/Materials/TunnelMaterial.js
+++ b/js/helper-classes/RDGE/Materials/TunnelMaterial.js
@@ -62,6 +62,9 @@ function TunnelMaterial()
62 62
63 this.init = function( world ) 63 this.init = function( world )
64 { 64 {
65 // save the world
66 if (world) this.setWorld( world );
67
65 // set up the shader 68 // set up the shader
66 this._shader = new jshader(); 69 this._shader = new jshader();
67 this._shader.def = tunnelMaterialDef; 70 this._shader.def = tunnelMaterialDef;