diff options
| author | Pushkar Joshi | 2012-02-09 13:42:59 -0800 |
|---|---|---|
| committer | Pushkar Joshi | 2012-02-09 13:42:59 -0800 |
| commit | 6bb00e69713bd7131b2bc0a15e4e0cb6071d616c (patch) | |
| tree | 08d43d3c3a6777032ce51c503947874c02bf3947 /js/helper-classes/RDGE/MaterialsLibrary.js | |
| parent | 5f42bd1f7723483d374cdd3fe51ef8298c86a1a2 (diff) | |
| parent | 666ae3e9119410cbf7fa974274d95336aaff091c (diff) | |
| download | ninja-6bb00e69713bd7131b2bc0a15e4e0cb6071d616c.tar.gz | |
Merge branch 'master' into brushtool
Diffstat (limited to 'js/helper-classes/RDGE/MaterialsLibrary.js')
| -rw-r--r-- | js/helper-classes/RDGE/MaterialsLibrary.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/helper-classes/RDGE/MaterialsLibrary.js b/js/helper-classes/RDGE/MaterialsLibrary.js index 9616b525..e7fc51ac 100644 --- a/js/helper-classes/RDGE/MaterialsLibrary.js +++ b/js/helper-classes/RDGE/MaterialsLibrary.js | |||
| @@ -141,7 +141,7 @@ var MaterialsLibrary = Object.create(Object.prototype, { | |||
| 141 | case "julia": mat = new JuliaMaterial(); break; | 141 | case "julia": mat = new JuliaMaterial(); break; |
| 142 | case "mandel": mat = new MandelMaterial(); break; | 142 | case "mandel": mat = new MandelMaterial(); break; |
| 143 | case "plasma": mat = new PlasmaMaterial(); break; | 143 | case "plasma": mat = new PlasmaMaterial(); break; |
| 144 | case "bumpMetal": mat = new PlasmaMaterial(); break; | 144 | case "bumpMetal": mat = new BumpMetalMaterial(); break; |
| 145 | case "uber": mat = new UberMaterial(); break; | 145 | case "uber": mat = new UberMaterial(); break; |
| 146 | 146 | ||
| 147 | default: | 147 | default: |