diff options
| author | Eric Guzman | 2012-03-29 16:29:04 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-03-29 16:29:04 -0700 |
| commit | ccd57d8610a7839cf14b2c9e354b64acf53093a7 (patch) | |
| tree | f11b4418483fd21831b72ca6dc0451422a25bfe2 /js/models | |
| parent | 7aefa059c79c9bef5c7a8a93cdfbd1ce55f69118 (diff) | |
| parent | f4949cab544886702e7ad6eeaa6215125c7b067a (diff) | |
| download | ninja-ccd57d8610a7839cf14b2c9e354b64acf53093a7.tar.gz | |
Merge branch 'refs/heads/master' into PresetsPI
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; |