diff options
| author | John Mayhew | 2012-02-10 16:04:19 -0800 |
|---|---|---|
| committer | John Mayhew | 2012-02-10 16:04:19 -0800 |
| commit | 730c1e191e36b8ab8dba576c481a6585e0dfa69e (patch) | |
| tree | c86445ff8d1981e97096ec5e9f6cc5301dc9ea40 /js/helper-classes/RDGE/MaterialsLibrary.js | |
| parent | cde1dd9a9156b9682fdf85ce2cd4acdd94124c37 (diff) | |
| parent | 48977780443d97b9e97b047066639c9056788041 (diff) | |
| download | ninja-730c1e191e36b8ab8dba576c481a6585e0dfa69e.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch
Conflicts:
js/ninja.reel/ninja.html
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: |