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/JuliaMaterial.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/JuliaMaterial.js')
| -rwxr-xr-x | js/helper-classes/RDGE/Materials/JuliaMaterial.js | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/js/helper-classes/RDGE/Materials/JuliaMaterial.js b/js/helper-classes/RDGE/Materials/JuliaMaterial.js index 69884d18..f95263f4 100755 --- a/js/helper-classes/RDGE/Materials/JuliaMaterial.js +++ b/js/helper-classes/RDGE/Materials/JuliaMaterial.js | |||
| @@ -64,6 +64,9 @@ function JuliaMaterial() | |||
| 64 | 64 | ||
| 65 | this.init = function( world ) | 65 | this.init = function( world ) |
| 66 | { | 66 | { |
| 67 | // save the world | ||
| 68 | if (world) this.setWorld( world ); | ||
| 69 | |||
| 67 | // set up the shader | 70 | // set up the shader |
| 68 | this._shader = new jshader(); | 71 | this._shader = new jshader(); |
| 69 | this._shader.def = JuliaMaterialDef; | 72 | this._shader.def = JuliaMaterialDef; |