diff options
| author | Nivesh Rajbhandari | 2012-03-26 21:59:21 -0700 |
|---|---|---|
| committer | Nivesh Rajbhandari | 2012-03-26 21:59:21 -0700 |
| commit | 2d94104653667e93e0f7e5f8d12bc4f7b82e64fa (patch) | |
| tree | 89b0ae1c6d49916544f5003f7c6d08d19b2a4fb1 /js/models | |
| parent | 309dde5a8c4599cef6a1052c1ff9ee1ad8ec5858 (diff) | |
| parent | 723ea402b74efa0424b96c7e125c8ebb2b72410c (diff) | |
| download | ninja-2d94104653667e93e0f7e5f8d12bc4f7b82e64fa.tar.gz | |
Merge branch 'refs/heads/montage-integration' into WebGLFileIO
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; |