diff options
| author | Pushkar Joshi | 2012-03-13 11:24:35 -0700 |
|---|---|---|
| committer | Pushkar Joshi | 2012-03-13 11:24:35 -0700 |
| commit | 4ad1650f629e7e345eade52ed6dadc233b27cc45 (patch) | |
| tree | 0e7b925f4dedf27f2684915e7e247e79c4a74aff /js/lib/rdge/materials/twist-material.js | |
| parent | 730c42e005b1ebd96448e3bc2dd700ffd8909cb5 (diff) | |
| parent | 9f3307810541ca6f95d7ca6d1febe8afdcd2c101 (diff) | |
| download | ninja-4ad1650f629e7e345eade52ed6dadc233b27cc45.tar.gz | |
Merge branch 'master' into pentool
Diffstat (limited to 'js/lib/rdge/materials/twist-material.js')
| -rw-r--r-- | js/lib/rdge/materials/twist-material.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/lib/rdge/materials/twist-material.js b/js/lib/rdge/materials/twist-material.js index eb562e99..163c8a77 100644 --- a/js/lib/rdge/materials/twist-material.js +++ b/js/lib/rdge/materials/twist-material.js | |||
| @@ -56,7 +56,7 @@ var TwistMaterial = function TwistMaterial() { | |||
| 56 | this._shader.init(); | 56 | this._shader.init(); |
| 57 | 57 | ||
| 58 | // set up the material node | 58 | // set up the material node |
| 59 | this._materialNode = createMaterialNode("twistMaterial"); | 59 | this._materialNode = createMaterialNode("twistMaterial" + "_" + world.generateUniqueNodeID()); |
| 60 | this._materialNode.setShader(this._shader); | 60 | this._materialNode.setShader(this._shader); |
| 61 | 61 | ||
| 62 | this._time = 0; | 62 | this._time = 0; |