aboutsummaryrefslogtreecommitdiff
path: root/js/helper-classes/backup-delete/Materials/StarMaterial.js
diff options
context:
space:
mode:
authorJose Antonio Marquez Russo2012-03-08 10:49:06 -0800
committerJose Antonio Marquez Russo2012-03-08 10:49:06 -0800
commit85f21e020ac281e8e545df1cf269034de99a00b1 (patch)
tree441834fa8b02b1cc2a970210020d27e06d2c99be /js/helper-classes/backup-delete/Materials/StarMaterial.js
parentd9813946dc28d8c28033a68b68300b9d9eda115c (diff)
parent11a6f18e274d7232cdbb8f6e9e65e0a5ab756451 (diff)
downloadninja-85f21e020ac281e8e545df1cf269034de99a00b1.tar.gz
Merge pull request #29 from ericmueller/integration
Integration
Diffstat (limited to 'js/helper-classes/backup-delete/Materials/StarMaterial.js')
-rw-r--r--js/helper-classes/backup-delete/Materials/StarMaterial.js2
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;