diff options
| author | Nivesh Rajbhandari | 2012-03-13 13:05:16 -0700 |
|---|---|---|
| committer | Nivesh Rajbhandari | 2012-03-13 13:05:16 -0700 |
| commit | e19376c54eedd1f1c457ba405b2f110be376a559 (patch) | |
| tree | d48c090f71ed2cd6bd6ce38ff68c36ab69299985 /js/lib/rdge/materials/keleidoscope-material.js | |
| parent | 970c2e63aa8ec3f70df2bf073cedb9e3b7617755 (diff) | |
| parent | f56b8cf4d3316d250c0f0045fb78f0dbd5c56e94 (diff) | |
| download | ninja-e19376c54eedd1f1c457ba405b2f110be376a559.tar.gz | |
Merge branch 'refs/heads/ninja-internal' into WebGLFixes
Diffstat (limited to 'js/lib/rdge/materials/keleidoscope-material.js')
| -rw-r--r-- | js/lib/rdge/materials/keleidoscope-material.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/lib/rdge/materials/keleidoscope-material.js b/js/lib/rdge/materials/keleidoscope-material.js index 3ef5d613..16d1ccfa 100644 --- a/js/lib/rdge/materials/keleidoscope-material.js +++ b/js/lib/rdge/materials/keleidoscope-material.js | |||
| @@ -60,7 +60,7 @@ var KeleidoscopeMaterial = function KeleidoscopeMaterial() { | |||
| 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("keleidoscopeMaterial"); | 63 | this._materialNode = createMaterialNode("keleidoscopeMaterial" + "_" + world.generateUniqueNodeID()); |
| 64 | this._materialNode.setShader(this._shader); | 64 | this._materialNode.setShader(this._shader); |
| 65 | 65 | ||
| 66 | this._time = 0; | 66 | this._time = 0; |