From 31e924e1b8b8da8342b3ff2341c8284915486c0b Mon Sep 17 00:00:00 2001
From: hwc487
Date: Thu, 22 Mar 2012 15:32:19 -0700
Subject: Added Paris and Raiders materials

---
 assets/descriptor.json | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'assets/descriptor.json')

diff --git a/assets/descriptor.json b/assets/descriptor.json
index af0520dd..85fbc996 100644
--- a/assets/descriptor.json
+++ b/assets/descriptor.json
@@ -21,6 +21,9 @@
 		"images/cubelight.png",
 		"images/random_normal.png",
 		"images/white.png",
+        "images/paris.png",
+        "images/powderblue.png",
+        "images/raiders.png",
 		"shaders/Basic.frag.glsl",
 		"shaders/TwistVert.vert.glsl",
 		"shaders/Basic.vert.glsl",
@@ -36,6 +39,7 @@
 		"shaders/Keleidoscope.frag.glsl",
 		"shaders/plasma.frag.glsl",
 		"shaders/Mandel.frag.glsl",
+        "shaders/Paris.frag.glsl",
 		"shaders/plasma.vert.glsl",
 		"shaders/Pulse.frag.glsl",
 		"shaders/radialBlur.frag.glsl",
-- 
cgit v1.2.3