diff options
| author | Jonathan Duran | 2012-03-14 08:59:17 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-03-14 08:59:17 -0700 |
| commit | e065244ac75d1d0f25fd5c75cb58e714a13fe16b (patch) | |
| tree | 6b49a85a45fdd41b81be5603fbbc2e0d197eb187 /js/helper-classes/backup-delete/Materials/JuliaMaterial.js | |
| parent | e8f207dc50ad942ee8c1c1db6b146c0110ce3216 (diff) | |
| download | ninja-e065244ac75d1d0f25fd5c75cb58e714a13fe16b.tar.gz | |
Squashed commit of the following:
merge master into timeline
Signed-off-by: Jonathan Duran <jduran@motorola.com>
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; |