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/lib/rdge/materials/deform-material.js | |
| parent | 76f2021618c0a6a99a1b855233e353e84ca99467 (diff) | |
| parent | 4ad1650f629e7e345eade52ed6dadc233b27cc45 (diff) | |
| download | ninja-6023f7c8258e660388ee33730601f1161f9299e9.tar.gz | |
Merge branch 'pentool' into brushtool
Diffstat (limited to 'js/lib/rdge/materials/deform-material.js')
| -rw-r--r-- | js/lib/rdge/materials/deform-material.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/lib/rdge/materials/deform-material.js b/js/lib/rdge/materials/deform-material.js index 1e6af6ac..dfd89d12 100644 --- a/js/lib/rdge/materials/deform-material.js +++ b/js/lib/rdge/materials/deform-material.js | |||
| @@ -60,7 +60,7 @@ var DeformMaterial = function DeformMaterial() { | |||
| 60 | this._shader.init(); | 60 | this._shader.init(); |
| 61 | 61 | ||
| 62 | // set up the material node | 62 | // set up the material node |
| 63 | this._materialNode = createMaterialNode("deformMaterial"); | 63 | this._materialNode = createMaterialNode("deformMaterial" + "_" + world.generateUniqueNodeID()); |
| 64 | this._materialNode.setShader(this._shader); | 64 | this._materialNode.setShader(this._shader); |
| 65 | 65 | ||
| 66 | this._time = 0; | 66 | this._time = 0; |