aboutsummaryrefslogtreecommitdiff
path: root/assets/canvas-runtime.js
diff options
context:
space:
mode:
authorAnanya Sen2012-07-23 17:01:14 -0700
committerAnanya Sen2012-07-23 17:01:14 -0700
commit48d9ed19573a07c68da305d14ca6ab3a04d31d64 (patch)
treeb4bf6c48c7fdade2cf531d84cac3359489d38405 /assets/canvas-runtime.js
parentc07a7a9d11bc8299fa9686544b18840cc8e640c2 (diff)
parentafc7ad4f240fdf7890a79c2d4d7f8eb2e7c30a34 (diff)
downloadninja-48d9ed19573a07c68da305d14ca6ab3a04d31d64.tar.gz
Merge branch 'refs/heads/Jose-Document' into Document
Diffstat (limited to 'assets/canvas-runtime.js')
-rw-r--r--assets/canvas-runtime.js4
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":