diff options
| author | hwc487 | 2012-02-08 14:48:16 -0800 |
|---|---|---|
| committer | hwc487 | 2012-02-08 14:48:16 -0800 |
| commit | 43e713a85785cd170bf0f5312d149d93235dadf2 (patch) | |
| tree | 2142672a6cefe6ae531b84f3e23920f36157d394 /js/helper-classes/RDGE/MaterialsLibrary.js | |
| parent | 468d324f8e9a5f018bc7609b58254ae468075ce9 (diff) | |
| parent | 72805efb66c372bec2df8a2686dfd56c9ed26622 (diff) | |
| download | ninja-43e713a85785cd170bf0f5312d149d93235dadf2.tar.gz | |
Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into working
Conflicts:
js/helper-classes/RDGE/Materials/FlatMaterial.js
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 d2988acf..397cd392 100644 --- a/js/helper-classes/RDGE/MaterialsLibrary.js +++ b/js/helper-classes/RDGE/MaterialsLibrary.js | |||
| @@ -148,7 +148,7 @@ var MaterialsLibrary = Object.create(Object.prototype, { | |||
| 148 | case "julia": mat = new JuliaMaterial(); break; | 148 | case "julia": mat = new JuliaMaterial(); break; |
| 149 | case "mandel": mat = new MandelMaterial(); break; | 149 | case "mandel": mat = new MandelMaterial(); break; |
| 150 | case "plasma": mat = new PlasmaMaterial(); break; | 150 | case "plasma": mat = new PlasmaMaterial(); break; |
| 151 | case "bumpMetal": mat = new PlasmaMaterial(); break; | 151 | case "bumpMetal": mat = new BumpMetalMaterial(); break; |
| 152 | case "uber": mat = new UberMaterial(); break; | 152 | case "uber": mat = new UberMaterial(); break; |
| 153 | 153 | ||
| 154 | default: | 154 | default: |