diff options
author | Pushkar Joshi | 2012-03-27 12:43:50 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-03-27 12:43:50 -0700 |
commit | 02a34df0ec3201199d209d43f621898b5607c150 (patch) | |
tree | d520b35afb0a8154abe417dce232c263a89794ce /js/lib/geom | |
parent | 903b01b9d0501e6f974034273385a0517107b1e3 (diff) | |
parent | 675fffb08f570783f055471501f94fc273de2b9e (diff) | |
download | ninja-02a34df0ec3201199d209d43f621898b5607c150.tar.gz |
Merge branch 'master' into brushtool
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 be80f1e4..f1aa9f8a 100755 --- a/js/lib/geom/geom-obj.js +++ b/js/lib/geom/geom-obj.js | |||
@@ -303,6 +303,7 @@ var GeomObj = function GLGeomObj() { | |||
303 | case "deform": | 303 | case "deform": |
304 | case "water": | 304 | case "water": |
305 | case "paris": | 305 | case "paris": |
306 | case "raiders": | ||
306 | case "tunnel": | 307 | case "tunnel": |
307 | case "reliefTunnel": | 308 | case "reliefTunnel": |
308 | case "squareTunnel": | 309 | case "squareTunnel": |
@@ -376,6 +377,7 @@ var GeomObj = function GLGeomObj() { | |||
376 | case "deform": | 377 | case "deform": |
377 | case "water": | 378 | case "water": |
378 | case "paris": | 379 | case "paris": |
380 | case "raiders": | ||
379 | case "tunnel": | 381 | case "tunnel": |
380 | case "reliefTunnel": | 382 | case "reliefTunnel": |
381 | case "squareTunnel": | 383 | case "squareTunnel": |