diff options
| author | Valerio Virgillito | 2012-02-23 00:34:37 -0800 |
|---|---|---|
| committer | Valerio Virgillito | 2012-02-23 00:34:37 -0800 |
| commit | 3675cac3993430490d9eef18157314d53ffa1a6a (patch) | |
| tree | fb225a6d8fc3c983c96b1507483d628909dc8c1e /js/panels/Materials/Materials.xml | |
| parent | 2afef244a3f8124f8a049e504e9782c05904ce23 (diff) | |
| parent | 3730bbc7cc5d5f07b3d788885475a8f9810b480e (diff) | |
| download | ninja-3675cac3993430490d9eef18157314d53ffa1a6a.tar.gz | |
Merge pull request #60 from mqg734/WebGLMaterials
Integrating WebGL and canvas-2d drawing fixes. Fixed Materials Editor Popup to work with latest Montage framework. Also adding back WebGL materials.
Diffstat (limited to 'js/panels/Materials/Materials.xml')
| -rwxr-xr-x | js/panels/Materials/Materials.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/panels/Materials/Materials.xml b/js/panels/Materials/Materials.xml index e955623a..a958575e 100755 --- a/js/panels/Materials/Materials.xml +++ b/js/panels/Materials/Materials.xml | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | <?xml version="1.0" encoding="ISO-8859-1"?> | 1 | <?xml version="1.0" encoding="ISO-8859-1"?> |
| 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="BumpMetalMaterial" label="Bump Metal" /> | 5 | <leaf id="BumpMetalMaterial" label="Bump Metal" /> |
| 6 | <leaf id="LinearGradientMaterial" label="Linear Gradient" /> | 6 | <leaf id="LinearGradientMaterial" label="Linear Gradient" /> |
| 7 | <leaf id="RadialGradientMaterial" label="Radial Gradient" /> | 7 | <leaf id="RadialGradientMaterial" label="Radial Gradient" /> |