diff options
| author | Nivesh Rajbhandari | 2012-02-09 13:23:07 -0800 |
|---|---|---|
| committer | Nivesh Rajbhandari | 2012-02-09 13:23:07 -0800 |
| commit | 148e6f7c00e54b0ec6fa6bb6791f0ac0920af511 (patch) | |
| tree | 889719cf024d73e2e1e93d73a40f96a2a8d27dc6 /js/panels/Materials | |
| parent | a9a02ef8a206082ea9ea0cb66f3fb70e1f4256df (diff) | |
| parent | 666ae3e9119410cbf7fa974274d95336aaff091c (diff) | |
| download | ninja-148e6f7c00e54b0ec6fa6bb6791f0ac0920af511.tar.gz | |
Merge branch 'refs/heads/ninja-internal' into WebGLFixes
Conflicts:
js/helper-classes/RDGE/GLMaterial.js
js/helper-classes/RDGE/GLRectangle.js
js/helper-classes/RDGE/GLWorld.js
js/helper-classes/RDGE/Materials/FlatMaterial.js
js/helper-classes/RDGE/Materials/IridescentScalesMaterial.js
js/helper-classes/RDGE/Materials/JuliaMaterial.js
js/helper-classes/RDGE/Materials/KeleidoscopeMaterial.js
js/helper-classes/RDGE/Materials/MandelMaterial.js
js/helper-classes/RDGE/Materials/PlasmaMaterial.js
js/helper-classes/RDGE/Materials/PulseMaterial.js
js/helper-classes/RDGE/Materials/RadialBlurMaterial.js
js/helper-classes/RDGE/Materials/RadialGradientMaterial.js
js/helper-classes/RDGE/Materials/TunnelMaterial.js
js/helper-classes/RDGE/Materials/TwistMaterial.js
js/helper-classes/RDGE/rdge-compiled.js
js/helper-classes/RDGE/src/core/script/renderer.js
js/panels/Materials/Materials.xml
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/panels/Materials')
| -rw-r--r-- | 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 d300b495..e955623a 100644 --- 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" /> |