diff options
| author | Eric Guzman | 2012-03-17 00:05:14 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-03-17 00:05:14 -0700 |
| commit | a3192d8bc0f8c0698265817c14dcd2284fd89d7d (patch) | |
| tree | 497ac55f550ed52f9d73b464aafb2aa6cb5f5038 /js/lib/rdge/materials/keleidoscope-material.js | |
| parent | a6a6f9bcc5ff92f5bb5e9275336dfaec2d8e8f4c (diff) | |
| parent | 954f5a13e371febcb1c0fb8015c577ee51c23130 (diff) | |
| download | ninja-a3192d8bc0f8c0698265817c14dcd2284fd89d7d.tar.gz | |
Merge branch 'refs/heads/master' into AddAnimationsLibrary
Conflicts:
js/panels/presets/default-transition-presets.js
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; |