aboutsummaryrefslogtreecommitdiff
path: root/js/helper-classes/RDGE/Materials/TunnelMaterial.js
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-02-09 12:09:09 -0800
committerJose Antonio Marquez2012-02-09 12:09:09 -0800
commit44c65bc6bbd5b754f9073f93a3afca8dd9acc864 (patch)
tree0e9ac4c8b2f8ce3246739ab06053e9986e8c9b51 /js/helper-classes/RDGE/Materials/TunnelMaterial.js
parentd7e198f5a95011679fa2c536780edbdc533a4893 (diff)
parentce81a3f4387d80f9ac406e73b843fb5dbe9cf432 (diff)
downloadninja-44c65bc6bbd5b754f9073f93a3afca8dd9acc864.tar.gz
Merge branch 'refs/heads/NinjaInternal' into FileIO
Diffstat (limited to 'js/helper-classes/RDGE/Materials/TunnelMaterial.js')
-rwxr-xr-xjs/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 100755
--- 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;