diff options
author | Eric Guzman | 2012-07-20 11:24:19 -0700 |
---|---|---|
committer | Eric Guzman | 2012-07-20 11:24:19 -0700 |
commit | 3cc29231852440508bdeec1964e40ce59f979f99 (patch) | |
tree | 2faaf3d49337437e4a84818fe24dc64a60f8c611 /assets/canvas-runtime.js | |
parent | 8fdf2fc8aefee68aec4c7b5891e0375f704cbf26 (diff) | |
parent | 9053e2037821a5c8405fabb74db9635deacfe8d5 (diff) | |
download | ninja-3cc29231852440508bdeec1964e40ce59f979f99.tar.gz |
Merge branch 'refs/heads/master' into fixes_7.1
Diffstat (limited to 'assets/canvas-runtime.js')
-rw-r--r-- | assets/canvas-runtime.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/assets/canvas-runtime.js b/assets/canvas-runtime.js index 4ab377c6..4181dd89 100644 --- a/assets/canvas-runtime.js +++ b/assets/canvas-runtime.js | |||
@@ -635,11 +635,11 @@ NinjaCvsRt.RuntimeGeomObj = Object.create(Object.prototype, { | |||
635 | case "plasma": mat = Object.create(NinjaCvsRt.RuntimePlasmaMaterial, {}); break; | 635 | case "plasma": mat = Object.create(NinjaCvsRt.RuntimePlasmaMaterial, {}); break; |
636 | case "taper": mat = Object.create(NinjaCvsRt.RuntimeTaperMaterial, {}); break; | 636 | case "taper": mat = Object.create(NinjaCvsRt.RuntimeTaperMaterial, {}); break; |
637 | 637 | ||
638 | case "paris": | 638 | case "blueSky": |
639 | case "water": mat = Object.create(NinjaCvsRt.RuntimeWaterMaterial, {}); break; | 639 | case "water": mat = Object.create(NinjaCvsRt.RuntimeWaterMaterial, {}); break; |
640 | 640 | ||
641 | case "deform": | 641 | case "deform": |
642 | case "raiders": | 642 | case "darkBlur": |
643 | case "tunnel": | 643 | case "tunnel": |
644 | case "reliefTunnel": | 644 | case "reliefTunnel": |
645 | case "squareTunnel": | 645 | case "squareTunnel": |