diff options
| author | Valerio Virgillito | 2012-03-28 22:44:35 -0700 |
|---|---|---|
| committer | Valerio Virgillito | 2012-03-28 22:44:35 -0700 |
| commit | 7542f62ee7a4845c2472834d0dbe91bf669634da (patch) | |
| tree | 657e63dfec155ba18dc8c170d1b8f8179a936603 /js/models/materials-model.js | |
| parent | f09921e6085f4b16c6e69ac8bfd67eef644fc04e (diff) | |
| parent | 3fd2cdb59027b3f973b9165db9db4fdd22026941 (diff) | |
| download | ninja-7542f62ee7a4845c2472834d0dbe91bf669634da.tar.gz | |
Merge branch 'refs/heads/master' into components
Diffstat (limited to 'js/models/materials-model.js')
| -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; |