diff options
author | Valerio Virgillito | 2012-02-09 12:21:06 -0800 |
---|---|---|
committer | Valerio Virgillito | 2012-02-09 12:21:06 -0800 |
commit | 666ae3e9119410cbf7fa974274d95336aaff091c (patch) | |
tree | 2ef9e99cee3e90bf93f764ce5f49bdfce4e861f7 /js/helper-classes/RDGE/MaterialsLibrary.js | |
parent | ce81a3f4387d80f9ac406e73b843fb5dbe9cf432 (diff) | |
parent | d83fb1180aee8b046074b27ebd01aae378363a46 (diff) | |
download | ninja-666ae3e9119410cbf7fa974274d95336aaff091c.tar.gz |
Merge pull request #28 from mqg734/SnapManagerFixes
Merging SnapManager fixes, webGL drawing fixes and some 3d tool fixes
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: |