diff options
| author | Nivesh Rajbhandari | 2012-03-27 09:35:12 -0700 |
|---|---|---|
| committer | Nivesh Rajbhandari | 2012-03-27 09:35:12 -0700 |
| commit | 71b2d1f4ece0f0760bc15900ee0b1f937a9b9431 (patch) | |
| tree | 4c0da519620ecb318640e201a7f503952025b3bf /js/models | |
| parent | 406bbfc63f8ed42d7da105dbd068a49ff8fb5f09 (diff) | |
| parent | 2d94104653667e93e0f7e5f8d12bc4f7b82e64fa (diff) | |
| download | ninja-71b2d1f4ece0f0760bc15900ee0b1f937a9b9431.tar.gz | |
Merge branch 'refs/heads/WebGLFileIO' into WebGLMaterials
Diffstat (limited to 'js/models')
| -rwxr-xr-x | js/models/materials-model.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/js/models/materials-model.js b/js/models/materials-model.js index 692ac09a..44364aa2 100755 --- a/js/models/materials-model.js +++ b/js/models/materials-model.js | |||
| @@ -238,6 +238,7 @@ exports.MaterialsModel = Montage.create(Component, { | |||
| 238 | case "fly": mat = new FlyMaterial(); break; | 238 | case "fly": mat = new FlyMaterial(); break; |
| 239 | case "water": mat = new WaterMaterial(); break; | 239 | case "water": mat = new WaterMaterial(); break; |
| 240 | case "paris": mat = new ParisMaterial(); break; | 240 | case "paris": mat = new ParisMaterial(); break; |
| 241 | case "raiders": mat = new RaidersMaterial(); break; | ||
| 241 | case "zinvert": mat = new ZInvertMaterial(); break; | 242 | case "zinvert": mat = new ZInvertMaterial(); break; |
| 242 | case "deform": mat = new DeformMaterial(); break; | 243 | case "deform": mat = new DeformMaterial(); break; |
| 243 | case "star": mat = new StarMaterial(); break; | 244 | case "star": mat = new StarMaterial(); break; |