From e065244ac75d1d0f25fd5c75cb58e714a13fe16b Mon Sep 17 00:00:00 2001 From: Jonathan Duran Date: Wed, 14 Mar 2012 08:59:17 -0700 Subject: Squashed commit of the following: merge master into timeline Signed-off-by: Jonathan Duran --- js/helper-classes/backup-delete/Materials/WaterMaterial.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'js/helper-classes/backup-delete/Materials/WaterMaterial.js') diff --git a/js/helper-classes/backup-delete/Materials/WaterMaterial.js b/js/helper-classes/backup-delete/Materials/WaterMaterial.js index 101a8c0c..49761c58 100644 --- a/js/helper-classes/backup-delete/Materials/WaterMaterial.js +++ b/js/helper-classes/backup-delete/Materials/WaterMaterial.js @@ -22,7 +22,7 @@ function WaterMaterial() this._name = "WaterMaterial"; this._shaderName = "water"; - this._texMap = 'assets/images/rocky-normal.jpg'; + this._texMap = 'assets/images/rocky-normal.jpg\n'; this._time = 0.0; this._dTime = 0.01; @@ -71,7 +71,7 @@ function WaterMaterial() this._shader.init(); // set up the material node - this._materialNode = createMaterialNode("waterMaterial"); + this._materialNode = createMaterialNode("waterMaterial_" + world.generateUniqueNodeID()); this._materialNode.setShader(this._shader); this._time = 0; -- cgit v1.2.3