diff options
author | Jose Antonio Marquez | 2012-02-09 12:09:09 -0800 |
---|---|---|
committer | Jose Antonio Marquez | 2012-02-09 12:09:09 -0800 |
commit | 44c65bc6bbd5b754f9073f93a3afca8dd9acc864 (patch) | |
tree | 0e9ac4c8b2f8ce3246739ab06053e9986e8c9b51 /js/helper-classes/RDGE/Materials/IridescentScalesMaterial.js | |
parent | d7e198f5a95011679fa2c536780edbdc533a4893 (diff) | |
parent | ce81a3f4387d80f9ac406e73b843fb5dbe9cf432 (diff) | |
download | ninja-44c65bc6bbd5b754f9073f93a3afca8dd9acc864.tar.gz |
Merge branch 'refs/heads/NinjaInternal' into FileIO
Diffstat (limited to 'js/helper-classes/RDGE/Materials/IridescentScalesMaterial.js')
-rwxr-xr-x | js/helper-classes/RDGE/Materials/IridescentScalesMaterial.js | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/js/helper-classes/RDGE/Materials/IridescentScalesMaterial.js b/js/helper-classes/RDGE/Materials/IridescentScalesMaterial.js index ac1d3fe7..a8b1c18b 100755 --- a/js/helper-classes/RDGE/Materials/IridescentScalesMaterial.js +++ b/js/helper-classes/RDGE/Materials/IridescentScalesMaterial.js | |||
@@ -80,8 +80,11 @@ function IridescentScalesMaterial() | |||
80 | /////////////////////////////////////////////////////////////////////// | 80 | /////////////////////////////////////////////////////////////////////// |
81 | this.dup = function() { return new IridescentScalesMaterial(); } | 81 | this.dup = function() { return new IridescentScalesMaterial(); } |
82 | 82 | ||
83 | this.init = function() | 83 | this.init = function( world ) |
84 | { | 84 | { |
85 | // save the world | ||
86 | if (world) this.setWorld( world ); | ||
87 | |||
85 | // set up the shader | 88 | // set up the shader |
86 | this._shader = new jshader(); | 89 | this._shader = new jshader(); |
87 | this._shader.def = iridescentScalesShaderDef; | 90 | this._shader.def = iridescentScalesShaderDef; |