diff options
| author | Jonathan Duran | 2012-03-14 08:59:17 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-03-14 08:59:17 -0700 |
| commit | e065244ac75d1d0f25fd5c75cb58e714a13fe16b (patch) | |
| tree | 6b49a85a45fdd41b81be5603fbbc2e0d197eb187 /js/lib/rdge/materials/water-material.js | |
| parent | e8f207dc50ad942ee8c1c1db6b146c0110ce3216 (diff) | |
| download | ninja-e065244ac75d1d0f25fd5c75cb58e714a13fe16b.tar.gz | |
Squashed commit of the following:
merge master into timeline
Signed-off-by: Jonathan Duran <jduran@motorola.com>
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; |