diff options
| author | Nivesh Rajbhandari | 2012-02-09 12:02:27 -0800 |
|---|---|---|
| committer | Nivesh Rajbhandari | 2012-02-09 12:02:27 -0800 |
| commit | a9b1a1f2642841c4165ede69d131b1deb6238622 (patch) | |
| tree | 2076dc497fbde041283af8b0082b0f4e24c9e1c6 /js/helper-classes/RDGE/Materials/JuliaMaterial.js | |
| parent | 31e2eb0d0da9b032116ad073918ca36ec11dac45 (diff) | |
| parent | ce81a3f4387d80f9ac406e73b843fb5dbe9cf432 (diff) | |
| download | ninja-a9b1a1f2642841c4165ede69d131b1deb6238622.tar.gz | |
Merge branch 'refs/heads/ninja-internal' into SnapManagerFixes
Conflicts:
js/helper-classes/RDGE/Materials/FlatMaterial.js
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
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; |