diff options
| author | Jose Antonio Marquez | 2012-02-11 22:33:26 -0800 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-02-11 22:33:26 -0800 |
| commit | c6ed3331e88eb01a52ac533e5449df3af2fb5965 (patch) | |
| tree | 2b660dc94a98bad02b46ba44a28424d692435fb3 /js/panels/Materials/Materials.xml | |
| parent | 5d38e575b2bafeae9bd676247fce15ec5f78fa32 (diff) | |
| parent | e142611e22718b1f1d1696902ad9161ec5f33f98 (diff) | |
| download | ninja-c6ed3331e88eb01a52ac533e5449df3af2fb5965.tar.gz | |
Merge branch 'refs/heads/NinjaInternal' into Color
Diffstat (limited to 'js/panels/Materials/Materials.xml')
| -rw-r--r-- | js/panels/Materials/Materials.xml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/js/panels/Materials/Materials.xml b/js/panels/Materials/Materials.xml index de07990e..e955623a 100644 --- a/js/panels/Materials/Materials.xml +++ b/js/panels/Materials/Materials.xml | |||
| @@ -3,6 +3,9 @@ | |||
| 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="BumpMetalMaterial" label="Bump Metal" /> | 5 | <leaf id="BumpMetalMaterial" label="Bump Metal" /> |
| 6 | <leaf id="LinearGradientMaterial" label="Linear Gradient" /> | ||
| 7 | <leaf id="RadialGradientMaterial" label="Radial Gradient" /> | ||
| 8 | <leaf id="FlatMaterial" label="Flat" /> | ||
| 6 | </folder> | 9 | </folder> |
| 7 | <folder id="customMaterials" label="Custom Materials"> | 10 | <folder id="customMaterials" label="Custom Materials"> |
| 8 | <leaf id="CheckerBoard" label="CheckerBoard" /> | 11 | <leaf id="CheckerBoard" label="CheckerBoard" /> |