diff options
author | Valerio Virgillito | 2012-02-09 13:41:45 -0800 |
---|---|---|
committer | Valerio Virgillito | 2012-02-09 13:41:45 -0800 |
commit | f5193cd04a2597051d88fced878efbc4802ea64c (patch) | |
tree | dc343dc98fa9f99133d9882bd9b92cfe81296d1a /js/helper-classes/RDGE/Materials/IridescentScalesMaterial.js | |
parent | e2539230b8a297fa972af6d53fe9de3ef2ad43fa (diff) | |
parent | 666ae3e9119410cbf7fa974274d95336aaff091c (diff) | |
download | ninja-f5193cd04a2597051d88fced878efbc4802ea64c.tar.gz |
Merge branch 'refs/heads/master' into components
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; |