diff options
| author | Eric Guzman | 2012-04-09 15:44:09 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-04-09 15:44:09 -0700 |
| commit | a27915e900eb768dd9db1f0dd441961ea80bfaa6 (patch) | |
| tree | 593f429f0b3294103a059ae9f6ed03858288deb7 /js/lib/drawing | |
| parent | afcaa157f7bc067cf00de91b43b2a71e9b64b7b3 (diff) | |
| parent | bd43ce383b050d03b0f92cc923c517febc66ca28 (diff) | |
| download | ninja-a27915e900eb768dd9db1f0dd441961ea80bfaa6.tar.gz | |
Merge branch 'refs/heads/master' into CSSPanelUpdates
Diffstat (limited to 'js/lib/drawing')
| -rwxr-xr-x | js/lib/drawing/world.js | 2 |
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 ); |