diff options
| author | Jose Antonio Marquez Russo | 2012-03-08 10:49:06 -0800 |
|---|---|---|
| committer | Jose Antonio Marquez Russo | 2012-03-08 10:49:06 -0800 |
| commit | 85f21e020ac281e8e545df1cf269034de99a00b1 (patch) | |
| tree | 441834fa8b02b1cc2a970210020d27e06d2c99be /js/lib/rdge/materials/water-material.js | |
| parent | d9813946dc28d8c28033a68b68300b9d9eda115c (diff) | |
| parent | 11a6f18e274d7232cdbb8f6e9e65e0a5ab756451 (diff) | |
| download | ninja-85f21e020ac281e8e545df1cf269034de99a00b1.tar.gz | |
Merge pull request #29 from ericmueller/integration
Integration
Diffstat (limited to 'js/lib/rdge/materials/water-material.js')
| -rw-r--r-- | js/lib/rdge/materials/water-material.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/lib/rdge/materials/water-material.js b/js/lib/rdge/materials/water-material.js index 92b96b18..cac5a249 100644 --- a/js/lib/rdge/materials/water-material.js +++ b/js/lib/rdge/materials/water-material.js | |||
| @@ -57,7 +57,7 @@ var WaterMaterial = function WaterMaterial() { | |||
| 57 | this._shader.init(); | 57 | this._shader.init(); |
| 58 | 58 | ||
| 59 | // set up the material node | 59 | // set up the material node |
| 60 | this._materialNode = createMaterialNode("waterMaterial"); | 60 | this._materialNode = createMaterialNode("waterMaterial" + "_" + world.generateUniqueNodeID()); |
| 61 | this._materialNode.setShader(this._shader); | 61 | this._materialNode.setShader(this._shader); |
| 62 | 62 | ||
| 63 | this._time = 0; | 63 | this._time = 0; |