diff options
| author | John Mayhew | 2012-02-10 16:04:19 -0800 |
|---|---|---|
| committer | John Mayhew | 2012-02-10 16:04:19 -0800 |
| commit | 730c1e191e36b8ab8dba576c481a6585e0dfa69e (patch) | |
| tree | c86445ff8d1981e97096ec5e9f6cc5301dc9ea40 /js/helper-classes/RDGE/Materials/JuliaMaterial.js | |
| parent | cde1dd9a9156b9682fdf85ce2cd4acdd94124c37 (diff) | |
| parent | 48977780443d97b9e97b047066639c9056788041 (diff) | |
| download | ninja-730c1e191e36b8ab8dba576c481a6585e0dfa69e.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch
Conflicts:
js/ninja.reel/ninja.html
Diffstat (limited to 'js/helper-classes/RDGE/Materials/JuliaMaterial.js')
| -rw-r--r-- | 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 100644 --- 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; |