diff options
| author | Valerio Virgillito | 2012-03-13 11:15:34 -0700 |
|---|---|---|
| committer | Valerio Virgillito | 2012-03-13 11:15:34 -0700 |
| commit | f6b958360d82854bdaf51848e7fd715d1f633179 (patch) | |
| tree | 80f6c08bb730089bdd3f26310df8d2363f9ba863 /js/lib/rdge/materials/deform-material.js | |
| parent | c24f58c10231c30d3a8a4c9fb9a4f395dd746180 (diff) | |
| parent | 4d7b86f55c504ee4e8c2460cf6b60cb9a2cf18f0 (diff) | |
| download | ninja-f6b958360d82854bdaf51848e7fd715d1f633179.tar.gz | |
Merge pull request #105 from joseeight/FileIO-Build-Candidate
File I/O adding webGL/canvas data functionality
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; |