diff options
author | Nivesh Rajbhandari | 2012-03-13 13:05:33 -0700 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-03-13 13:05:33 -0700 |
commit | 92fc2e3c4bca2edb04102431b4959aafe022f329 (patch) | |
tree | d48c090f71ed2cd6bd6ce38ff68c36ab69299985 /js/helper-classes/backup-delete/Materials/StarMaterial.js | |
parent | efb92cf52680d31f05fed3757e74862592cc2d4c (diff) | |
parent | f56b8cf4d3316d250c0f0045fb78f0dbd5c56e94 (diff) | |
download | ninja-92fc2e3c4bca2edb04102431b4959aafe022f329.tar.gz |
Merge branch 'refs/heads/ninja-internal' into ToolFixes
Diffstat (limited to 'js/helper-classes/backup-delete/Materials/StarMaterial.js')
-rw-r--r-- | js/helper-classes/backup-delete/Materials/StarMaterial.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/helper-classes/backup-delete/Materials/StarMaterial.js b/js/helper-classes/backup-delete/Materials/StarMaterial.js index a5f188a1..ea8e4edb 100644 --- a/js/helper-classes/backup-delete/Materials/StarMaterial.js +++ b/js/helper-classes/backup-delete/Materials/StarMaterial.js | |||
@@ -71,7 +71,7 @@ function StarMaterial() | |||
71 | this._shader.init(); | 71 | this._shader.init(); |
72 | 72 | ||
73 | // set up the material node | 73 | // set up the material node |
74 | this._materialNode = createMaterialNode("starMaterial"); | 74 | this._materialNode = createMaterialNode("starMaterial_" + world.generateUniqueNodeID()); |
75 | this._materialNode.setShader(this._shader); | 75 | this._materialNode.setShader(this._shader); |
76 | 76 | ||
77 | this._time = 0; | 77 | this._time = 0; |