From 2779b48197effabe1a975c8139c497631238f8f1 Mon Sep 17 00:00:00 2001
From: hwc487
Date: Fri, 15 Jun 2012 11:26:57 -0700
Subject: Re-added Paris material

---
 js/lib/rdge/materials/water-material.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'js/lib')

diff --git a/js/lib/rdge/materials/water-material.js b/js/lib/rdge/materials/water-material.js
index f2ef0e49..982b581f 100644
--- a/js/lib/rdge/materials/water-material.js
+++ b/js/lib/rdge/materials/water-material.js
@@ -133,11 +133,11 @@ var ParisMaterial = function ParisMaterial()
 	this.inheritedFrom = WaterMaterial;
 	this.inheritedFrom();
 
-	this._name = "ParisMaterial";
+	this._name = "Paris";
 	this._shaderName = "paris";
 
 	this._defaultTexMap = 'assets/images/paris.png';
-	this._propValues[this._propNames[u_tex_index]] = this._defaultTexMap.slice(0);
+	this._propValues[this._propNames[0]] = this._defaultTexMap.slice(0);
 
 	//this._diffuseColor = [0.5, 0.5, 0.5, 0.5];
 	//this._propValues[this._propNames[1]] = this._diffuseColor.slice();
-- 
cgit v1.2.3