diff options
author | Pushkar Joshi | 2012-02-02 11:28:45 -0800 |
---|---|---|
committer | Pushkar Joshi | 2012-02-02 11:28:45 -0800 |
commit | acc500d1f1c76f4e7c93ae1cfea8d925ca95e7b9 (patch) | |
tree | 877f8ca734228c11050b037ce82fc0d1e1303193 /js/helper-classes/RDGE/Materials/IridescentScalesMaterial.js | |
parent | 4d4de64472603426a73b26cc98ba8206190949b8 (diff) | |
parent | 4222db97e353fb65fab787ba5927d16d9fa4e1f7 (diff) | |
download | ninja-acc500d1f1c76f4e7c93ae1cfea8d925ca95e7b9.tar.gz |
Merge branch 'working' of c:/Code/github/emueller/ninja-internal/ into pentool
Diffstat (limited to 'js/helper-classes/RDGE/Materials/IridescentScalesMaterial.js')
-rw-r--r-- | 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 100644 --- 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; |