Merge branch 'patch-2' of github.com:giuseppelt/cocos2d-html5 into develop

pandamicro · pandamicro · commit 566852c53b16 · 2017-03-15T16:43:13.000+08:00
# Conflicts:
#	cocos2d/core/base-nodes/CCNode.js
diff --git a/cocos2d/core/base-nodes/CCNode.js b/cocos2d/core/base-nodes/CCNode.js
@@ -2015,7 +2015,7 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{
     updateTransform: function () {
         var children = this._children, node;
         for (var i = 0; i < children.length; i++) {
-            var node = children[i];
+            node = children[i];
             if (node)
                 node.updateTransform();
         }

Original file line number	Diff line number	Diff line change
`@@ -2015,7 +2015,7 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{`
`2015`	`2015`	`updateTransform: function () {`
`2016`	`2016`	`var children = this._children, node;`
`2017`	`2017`	`for (var i = 0; i < children.length; i++) {`
`2018`		`- var node = children[i];`
	`2018`	`+ node = children[i];`
`2019`	`2019`	`if (node)`
`2020`	`2020`	`node.updateTransform();`
`2021`	`2021`	`}`