diff options
| author | Jose Antonio Marquez | 2012-03-27 14:27:26 -0700 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-03-27 14:27:26 -0700 |
| commit | 57696598cd39d4aa31b5106cba29dd2b6d02c6d9 (patch) | |
| tree | 215b54eee4d6f982809087c59cf8f1d37b2f4350 /js/models/materials-model.js | |
| parent | 7bf738bc08f6a24edce30dbc2b101a8cab2d27aa (diff) | |
| parent | 675fffb08f570783f055471501f94fc273de2b9e (diff) | |
| download | ninja-57696598cd39d4aa31b5106cba29dd2b6d02c6d9.tar.gz | |
Merge branch 'refs/heads/Ninja-Internal' into FileIO
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; |