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/SquareTunnelMaterial.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/SquareTunnelMaterial.js')
| -rw-r--r-- | js/helper-classes/backup-delete/Materials/SquareTunnelMaterial.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/helper-classes/backup-delete/Materials/SquareTunnelMaterial.js b/js/helper-classes/backup-delete/Materials/SquareTunnelMaterial.js index 8238b651..3a8afd18 100644 --- a/js/helper-classes/backup-delete/Materials/SquareTunnelMaterial.js +++ b/js/helper-classes/backup-delete/Materials/SquareTunnelMaterial.js | |||
| @@ -71,7 +71,7 @@ function SquareTunnelMaterial() | |||
| 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("squareTunnelMaterial"); | 74 | this._materialNode = createMaterialNode("squareTunnelMaterial_" + world.generateUniqueNodeID()); |
| 75 | this._materialNode.setShader(this._shader); | 75 | this._materialNode.setShader(this._shader); |
| 76 | 76 | ||
| 77 | this._time = 0; | 77 | this._time = 0; |