aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Materials/Materials.xml
diff options
context:
space:
mode:
authorJohn Mayhew2012-02-10 16:04:19 -0800
committerJohn Mayhew2012-02-10 16:04:19 -0800
commit730c1e191e36b8ab8dba576c481a6585e0dfa69e (patch)
treec86445ff8d1981e97096ec5e9f6cc5301dc9ea40 /js/panels/Materials/Materials.xml
parentcde1dd9a9156b9682fdf85ce2cd4acdd94124c37 (diff)
parent48977780443d97b9e97b047066639c9056788041 (diff)
downloadninja-730c1e191e36b8ab8dba576c481a6585e0dfa69e.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch
Conflicts: js/ninja.reel/ninja.html
Diffstat (limited to 'js/panels/Materials/Materials.xml')
-rw-r--r--js/panels/Materials/Materials.xml10
1 files changed, 10 insertions, 0 deletions
diff --git a/js/panels/Materials/Materials.xml b/js/panels/Materials/Materials.xml
index de07990e..cdeee69e 100644
--- a/js/panels/Materials/Materials.xml
+++ b/js/panels/Materials/Materials.xml
@@ -2,7 +2,17 @@
2<tree id="Materials"> 2<tree id="Materials">
3 <folder id="ninjaMaterials" label="Ninja Materials"> 3 <folder id="ninjaMaterials" label="Ninja Materials">
4 <leaf id="UberMaterial" label="Uber" /> 4 <leaf id="UberMaterial" label="Uber" />
5 <leaf id="RadialBlurMaterial" label="Radial Blur" />
6 <leaf id="PulseMaterial" label="Pulse" />
7 <leaf id="TunnelMaterial" label="Tunnel" />
8 <leaf id="TwistMaterial" label="Twist" />
9 <leaf id="KeleidoscopeMaterial" label="Keleidoscope" />
10 <leaf id="JuliaMaterial" label="Julia" />
11 <leaf id="MandelMaterial" label="Mandel" />
12 <leaf id="PlasmaMaterial" label="Plasma" />
5 <leaf id="BumpMetalMaterial" label="Bump Metal" /> 13 <leaf id="BumpMetalMaterial" label="Bump Metal" />
14 <leaf id="LinearGradientMaterial" label="Linear Gradient" />
15 <leaf id="RadialGradientMaterial" label="Radial Gradient" />
6 </folder> 16 </folder>
7 <folder id="customMaterials" label="Custom Materials"> 17 <folder id="customMaterials" label="Custom Materials">
8 <leaf id="CheckerBoard" label="CheckerBoard" /> 18 <leaf id="CheckerBoard" label="CheckerBoard" />