aboutsummaryrefslogtreecommitdiff
path: root/js/lib/drawing/world.js
diff options
context:
space:
mode:
authorJon Reid2012-04-10 14:52:23 -0700
committerJon Reid2012-04-10 14:52:23 -0700
commitc19987997758cf47ac9b93a2a767a0e2a9072745 (patch)
treeeb68491c5d04a5cf5ab75bedf2d6bbed3c7a3603 /js/lib/drawing/world.js
parent03a3b32b9b0fd2dc8e4b54bfd5282fd1f8fb6ed6 (diff)
parent422b14fc60be84c116115f2e71e3499e232f3f05 (diff)
downloadninja-c19987997758cf47ac9b93a2a767a0e2a9072745.tar.gz
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
Diffstat (limited to 'js/lib/drawing/world.js')
-rwxr-xr-xjs/lib/drawing/world.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/lib/drawing/world.js b/js/lib/drawing/world.js
index 657c849f..945c9883 100755
--- a/js/lib/drawing/world.js
+++ b/js/lib/drawing/world.js
@@ -854,7 +854,7 @@ World.prototype.importObjectsJSON = function (jObj, parentGeomObj) {
854 854
855 // determine if we have children 855 // determine if we have children
856 if (jObj.children) { 856 if (jObj.children) {
857 var nKids = ojObjbj.chilodren.length; 857 var nKids = jObj.children.length;
858 for (var i = 0; i < nKids; i++) { 858 for (var i = 0; i < nKids; i++) {
859 var child = jObj.children[i]; 859 var child = jObj.children[i];
860 this.importObjectsJSON( child, gObj ); 860 this.importObjectsJSON( child, gObj );