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/TwistVertMaterial.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/TwistVertMaterial.js')
| -rw-r--r-- | js/helper-classes/backup-delete/Materials/TwistVertMaterial.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/helper-classes/backup-delete/Materials/TwistVertMaterial.js b/js/helper-classes/backup-delete/Materials/TwistVertMaterial.js index 853e895c..dd49555c 100644 --- a/js/helper-classes/backup-delete/Materials/TwistVertMaterial.js +++ b/js/helper-classes/backup-delete/Materials/TwistVertMaterial.js | |||
| @@ -57,7 +57,7 @@ function TwistVertMaterial() | |||
| 57 | this._shader.twistMe.color.set( this.getColor() ); | 57 | this._shader.twistMe.color.set( this.getColor() ); |
| 58 | 58 | ||
| 59 | // set up the material node | 59 | // set up the material node |
| 60 | this._materialNode = createMaterialNode("twistVertMaterial"); | 60 | this._materialNode = createMaterialNode("twistVertMaterial_" + world.generateUniqueNodeID()); |
| 61 | this._materialNode.setShader(this._shader); | 61 | this._materialNode.setShader(this._shader); |
| 62 | 62 | ||
| 63 | // initialize the twist vert properties | 63 | // initialize the twist vert properties |