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/helper-classes/backup-delete/Materials/PlasmaMaterial.js | |
| parent | 970c2e63aa8ec3f70df2bf073cedb9e3b7617755 (diff) | |
| parent | f56b8cf4d3316d250c0f0045fb78f0dbd5c56e94 (diff) | |
| download | ninja-e19376c54eedd1f1c457ba405b2f110be376a559.tar.gz | |
Merge branch 'refs/heads/ninja-internal' into WebGLFixes
Diffstat (limited to 'js/helper-classes/backup-delete/Materials/PlasmaMaterial.js')
| -rw-r--r-- | js/helper-classes/backup-delete/Materials/PlasmaMaterial.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/helper-classes/backup-delete/Materials/PlasmaMaterial.js b/js/helper-classes/backup-delete/Materials/PlasmaMaterial.js index a65f3a33..4e60df9f 100644 --- a/js/helper-classes/backup-delete/Materials/PlasmaMaterial.js +++ b/js/helper-classes/backup-delete/Materials/PlasmaMaterial.js | |||
| @@ -74,7 +74,7 @@ function PlasmaMaterial() | |||
| 74 | this.setProperty( "color", [this._time, 0, 0, 1] ); | 74 | this.setProperty( "color", [this._time, 0, 0, 1] ); |
| 75 | 75 | ||
| 76 | // set up the material node | 76 | // set up the material node |
| 77 | this._materialNode = createMaterialNode("plasmaMaterial"); | 77 | this._materialNode = createMaterialNode("plasmaMaterial_" + world.generateUniqueNodeID()); |
| 78 | this._materialNode.setShader(this._shader); | 78 | this._materialNode.setShader(this._shader); |
| 79 | } | 79 | } |
| 80 | 80 | ||