diff options
author | Jose Antonio Marquez | 2012-02-09 12:09:09 -0800 |
---|---|---|
committer | Jose Antonio Marquez | 2012-02-09 12:09:09 -0800 |
commit | 44c65bc6bbd5b754f9073f93a3afca8dd9acc864 (patch) | |
tree | 0e9ac4c8b2f8ce3246739ab06053e9986e8c9b51 /js/panels/Materials | |
parent | d7e198f5a95011679fa2c536780edbdc533a4893 (diff) | |
parent | ce81a3f4387d80f9ac406e73b843fb5dbe9cf432 (diff) | |
download | ninja-44c65bc6bbd5b754f9073f93a3afca8dd9acc864.tar.gz |
Merge branch 'refs/heads/NinjaInternal' into FileIO
Diffstat (limited to 'js/panels/Materials')
-rwxr-xr-x | js/panels/Materials/Materials.xml | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/js/panels/Materials/Materials.xml b/js/panels/Materials/Materials.xml index de07990e..cdeee69e 100755 --- 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" /> |