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/lib/geom | |
parent | 406bbfc63f8ed42d7da105dbd068a49ff8fb5f09 (diff) | |
parent | 2d94104653667e93e0f7e5f8d12bc4f7b82e64fa (diff) | |
download | ninja-71b2d1f4ece0f0760bc15900ee0b1f937a9b9431.tar.gz |
Merge branch 'refs/heads/WebGLFileIO' into WebGLMaterials
Diffstat (limited to 'js/lib/geom')
-rwxr-xr-x | js/lib/geom/geom-obj.js | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/js/lib/geom/geom-obj.js b/js/lib/geom/geom-obj.js index a87bdbf5..3c4e4bbf 100755 --- a/js/lib/geom/geom-obj.js +++ b/js/lib/geom/geom-obj.js | |||
@@ -302,6 +302,7 @@ var GeomObj = function GLGeomObj() { | |||
302 | case "deform": | 302 | case "deform": |
303 | case "water": | 303 | case "water": |
304 | case "paris": | 304 | case "paris": |
305 | case "raiders": | ||
305 | case "tunnel": | 306 | case "tunnel": |
306 | case "reliefTunnel": | 307 | case "reliefTunnel": |
307 | case "squareTunnel": | 308 | case "squareTunnel": |
@@ -375,6 +376,7 @@ var GeomObj = function GLGeomObj() { | |||
375 | case "deform": | 376 | case "deform": |
376 | case "water": | 377 | case "water": |
377 | case "paris": | 378 | case "paris": |
379 | case "raiders": | ||
378 | case "tunnel": | 380 | case "tunnel": |
379 | case "reliefTunnel": | 381 | case "reliefTunnel": |
380 | case "squareTunnel": | 382 | case "squareTunnel": |