diff options
| author | Pushkar Joshi | 2012-03-13 11:36:11 -0700 |
|---|---|---|
| committer | Pushkar Joshi | 2012-03-13 11:36:11 -0700 |
| commit | 6023f7c8258e660388ee33730601f1161f9299e9 (patch) | |
| tree | 632484428b398f71b8481aa8e30180895ff2483c /js/helper-classes/backup-delete/Materials/JuliaMaterial.js | |
| parent | 76f2021618c0a6a99a1b855233e353e84ca99467 (diff) | |
| parent | 4ad1650f629e7e345eade52ed6dadc233b27cc45 (diff) | |
| download | ninja-6023f7c8258e660388ee33730601f1161f9299e9.tar.gz | |
Merge branch 'pentool' into brushtool
Diffstat (limited to 'js/helper-classes/backup-delete/Materials/JuliaMaterial.js')
| -rw-r--r-- | js/helper-classes/backup-delete/Materials/JuliaMaterial.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/helper-classes/backup-delete/Materials/JuliaMaterial.js b/js/helper-classes/backup-delete/Materials/JuliaMaterial.js index f95263f4..9b5d588c 100644 --- a/js/helper-classes/backup-delete/Materials/JuliaMaterial.js +++ b/js/helper-classes/backup-delete/Materials/JuliaMaterial.js | |||
| @@ -73,7 +73,7 @@ function JuliaMaterial() | |||
| 73 | this._shader.init(); | 73 | this._shader.init(); |
| 74 | 74 | ||
| 75 | // set up the material node | 75 | // set up the material node |
| 76 | this._materialNode = createMaterialNode("juliaMaterial"); | 76 | this._materialNode = createMaterialNode("juliaMaterial_" + world.generateUniqueNodeID()); |
| 77 | this._materialNode.setShader(this._shader); | 77 | this._materialNode.setShader(this._shader); |
| 78 | 78 | ||
| 79 | this._time = 0; | 79 | this._time = 0; |