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/KeleidoscopeMaterial.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/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; |