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/models/materials-model.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'js/models')

diff --git a/js/models/materials-model.js b/js/models/materials-model.js
index d8f9a9e2..3cc80982 100755
--- a/js/models/materials-model.js
+++ b/js/models/materials-model.js
@@ -27,7 +27,7 @@ var FlagMaterial = require("js/lib/rdge/materials/flag-material").FlagMaterial;
 var SquareTunnelMaterial = require("js/lib/rdge/materials/square-tunnel-material").SquareTunnelMaterial;
 var FlyMaterial = require("js/lib/rdge/materials/fly-material").FlyMaterial;
 var WaterMaterial = require("js/lib/rdge/materials/water-material").WaterMaterial;
-//var ParisMaterial = require("js/lib/rdge/materials/water-material").ParisMaterial;
+var ParisMaterial = require("js/lib/rdge/materials/water-material").ParisMaterial;
 var ZInvertMaterial = require("js/lib/rdge/materials/z-invert-material").ZInvertMaterial;
 var DeformMaterial = require("js/lib/rdge/materials/deform-material").DeformMaterial;
 var StarMaterial = require("js/lib/rdge/materials/star-material").StarMaterial;
@@ -58,9 +58,9 @@ exports.MaterialsModel = Montage.create(Component, {
 			this.addMaterial(new KeleidoscopeMaterial());
 			this.addMaterial(new LinearGradientMaterial());
 			this.addMaterial(new MandelMaterial());
+			this.addMaterial(new ParisMaterial());
 			this.addMaterial(new PlasmaMaterial());
 			this.addMaterial(new PulseMaterial());
-			//this.addMaterial(new ParisMaterial());
 			this.addMaterial(new RadialBlurMaterial());
 			this.addMaterial(new RadialGradientMaterial());
 			this.addMaterial(new RaidersMaterial());
@@ -235,7 +235,7 @@ exports.MaterialsModel = Montage.create(Component, {
 				case "flag":		        mat = new FlagMaterial();		        break;
 				case "fly":					mat = new FlyMaterial();				break;
 				case "water":				mat = new WaterMaterial();				break;
-				//case "paris":				mat = new ParisMaterial();				break;
+				case "paris":				mat = new ParisMaterial();				break;
 				case "raiders":		        mat = new RaidersMaterial();		    break;
 				case "zinvert":				mat = new ZInvertMaterial();			break;
 				case "deform":				mat = new DeformMaterial();				break;
-- 
cgit v1.2.3