diff options
| author | Jose Antonio Marquez Russo | 2012-03-08 10:49:06 -0800 |
|---|---|---|
| committer | Jose Antonio Marquez Russo | 2012-03-08 10:49:06 -0800 |
| commit | 85f21e020ac281e8e545df1cf269034de99a00b1 (patch) | |
| tree | 441834fa8b02b1cc2a970210020d27e06d2c99be /js/lib/rdge/materials/mandel-material.js | |
| parent | d9813946dc28d8c28033a68b68300b9d9eda115c (diff) | |
| parent | 11a6f18e274d7232cdbb8f6e9e65e0a5ab756451 (diff) | |
| download | ninja-85f21e020ac281e8e545df1cf269034de99a00b1.tar.gz | |
Merge pull request #29 from ericmueller/integration
Integration
Diffstat (limited to 'js/lib/rdge/materials/mandel-material.js')
| -rw-r--r-- | js/lib/rdge/materials/mandel-material.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/lib/rdge/materials/mandel-material.js b/js/lib/rdge/materials/mandel-material.js index 07e009a2..d9f00383 100644 --- a/js/lib/rdge/materials/mandel-material.js +++ b/js/lib/rdge/materials/mandel-material.js | |||
| @@ -66,7 +66,7 @@ var MandelMaterial = function MandelMaterial() { | |||
| 66 | this._shader.init(); | 66 | this._shader.init(); |
| 67 | 67 | ||
| 68 | // set up the material node | 68 | // set up the material node |
| 69 | this._materialNode = createMaterialNode("mandelMaterial"); | 69 | this._materialNode = createMaterialNode("mandelMaterial" + "_" + world.generateUniqueNodeID()); |
| 70 | this._materialNode.setShader(this._shader); | 70 | this._materialNode.setShader(this._shader); |
| 71 | 71 | ||
| 72 | this._time = 0; | 72 | this._time = 0; |