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/KeleidoscopeMaterial.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/KeleidoscopeMaterial.js')
| -rw-r--r-- | js/helper-classes/RDGE/Materials/KeleidoscopeMaterial.js | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/js/helper-classes/RDGE/Materials/KeleidoscopeMaterial.js b/js/helper-classes/RDGE/Materials/KeleidoscopeMaterial.js index 8f94f47b..1547aca9 100644 --- a/js/helper-classes/RDGE/Materials/KeleidoscopeMaterial.js +++ b/js/helper-classes/RDGE/Materials/KeleidoscopeMaterial.js | |||
| @@ -62,6 +62,9 @@ function KeleidoscopeMaterial() | |||
| 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 = keleidoscopeMaterialDef; | 70 | this._shader.def = keleidoscopeMaterialDef; |